2010-11-10 14:14:39

by Wolfram Sang

[permalink] [raw]

Subject: [PATCH] media: video: do not clear 'driver' from an i2c_client

---

The i2c-core does this already.

Reported-by: Jean Delvare <[email protected]>
Signed-off-by: Wolfram Sang <[email protected]>
---

Not sure if this should go via i2c or media?

drivers/media/video/imx074.c | 1 -
drivers/media/video/mt9m001.c | 1 -
drivers/media/video/mt9m111.c | 1 -
drivers/media/video/mt9t031.c | 1 -
drivers/media/video/mt9v022.c | 1 -
drivers/media/video/rj54n1cb0c.c | 1 -
6 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c
index 27b5dfd..1a11691 100644
--- a/drivers/media/video/imx074.c
+++ b/drivers/media/video/imx074.c
@@ -467,7 +467,6 @@ static int imx074_remove(struct i2c_client *client)
icd->ops = NULL;
if (icl->free_bus)
icl->free_bus(icl);
- client->driver = NULL;
kfree(priv);

return 0;
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index fcb4cd9..f7fc88d 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -798,7 +798,6 @@ static int mt9m001_remove(struct i2c_client *client)

icd->ops = NULL;
mt9m001_video_remove(icd);
- client->driver = NULL;
kfree(mt9m001);

return 0;
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 525a16e..53fa2a7 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -1092,7 +1092,6 @@ static int mt9m111_remove(struct i2c_client *client)
struct soc_camera_device *icd = client->dev.platform_data;

icd->ops = NULL;
- client->driver = NULL;
kfree(mt9m111);

return 0;
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c
index 9bd44a8..7ce279c 100644
--- a/drivers/media/video/mt9t031.c
+++ b/drivers/media/video/mt9t031.c
@@ -896,7 +896,6 @@ static int mt9t031_remove(struct i2c_client *client)

if (icd)
icd->ops = NULL;
- client->driver = NULL;
kfree(mt9t031);

return 0;
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index b96171c..6a784c8 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -930,7 +930,6 @@ static int mt9v022_remove(struct i2c_client *client)

icd->ops = NULL;
mt9v022_video_remove(icd);
- client->driver = NULL;
kfree(mt9v022);

return 0;
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c
index d2fa2d4..57e11b6 100644
--- a/drivers/media/video/rj54n1cb0c.c
+++ b/drivers/media/video/rj54n1cb0c.c
@@ -1460,7 +1460,6 @@ static int rj54n1_remove(struct i2c_client *client)
icd->ops = NULL;
if (icl->free_bus)
icl->free_bus(icl);
- client->driver = NULL;
kfree(rj54n1);

return 0;
--
1.7.2.3

2010-11-10 14:24:25

by Guennadi Liakhovetski

[permalink] [raw]

Subject: Re: [PATCH] media: video: do not clear 'driver' from an i2c_client

---

On Wed, 10 Nov 2010, Wolfram Sang wrote:

> The i2c-core does this already.
>
> Reported-by: Jean Delvare <[email protected]>
> Signed-off-by: Wolfram Sang <[email protected]>

Acked-by: Guennadi Liakhovetski <[email protected]>

> ---
>
> Not sure if this should go via i2c or media?
>
> drivers/media/video/imx074.c | 1 -
> drivers/media/video/mt9m001.c | 1 -
> drivers/media/video/mt9m111.c | 1 -
> drivers/media/video/mt9t031.c | 1 -
> drivers/media/video/mt9v022.c | 1 -
> drivers/media/video/rj54n1cb0c.c | 1 -
> 6 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c
> index 27b5dfd..1a11691 100644
> --- a/drivers/media/video/imx074.c
> +++ b/drivers/media/video/imx074.c
> @@ -467,7 +467,6 @@ static int imx074_remove(struct i2c_client *client)
> icd->ops = NULL;
> if (icl->free_bus)
> icl->free_bus(icl);
> - client->driver = NULL;
> kfree(priv);
>
> return 0;
> diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
> index fcb4cd9..f7fc88d 100644
> --- a/drivers/media/video/mt9m001.c
> +++ b/drivers/media/video/mt9m001.c
> @@ -798,7 +798,6 @@ static int mt9m001_remove(struct i2c_client *client)
>
> icd->ops = NULL;
> mt9m001_video_remove(icd);
> - client->driver = NULL;
> kfree(mt9m001);
>
> return 0;
> diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
> index 525a16e..53fa2a7 100644
> --- a/drivers/media/video/mt9m111.c
> +++ b/drivers/media/video/mt9m111.c
> @@ -1092,7 +1092,6 @@ static int mt9m111_remove(struct i2c_client *client)
> struct soc_camera_device *icd = client->dev.platform_data;
>
> icd->ops = NULL;
> - client->driver = NULL;
> kfree(mt9m111);
>
> return 0;
> diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c
> index 9bd44a8..7ce279c 100644
> --- a/drivers/media/video/mt9t031.c
> +++ b/drivers/media/video/mt9t031.c
> @@ -896,7 +896,6 @@ static int mt9t031_remove(struct i2c_client *client)
>
> if (icd)
> icd->ops = NULL;
> - client->driver = NULL;
> kfree(mt9t031);
>
> return 0;
> diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
> index b96171c..6a784c8 100644
> --- a/drivers/media/video/mt9v022.c
> +++ b/drivers/media/video/mt9v022.c
> @@ -930,7 +930,6 @@ static int mt9v022_remove(struct i2c_client *client)
>
> icd->ops = NULL;
> mt9v022_video_remove(icd);
> - client->driver = NULL;
> kfree(mt9v022);
>
> return 0;
> diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c
> index d2fa2d4..57e11b6 100644
> --- a/drivers/media/video/rj54n1cb0c.c
> +++ b/drivers/media/video/rj54n1cb0c.c
> @@ -1460,7 +1460,6 @@ static int rj54n1_remove(struct i2c_client *client)
> icd->ops = NULL;
> if (icl->free_bus)
> icl->free_bus(icl);
> - client->driver = NULL;
> kfree(rj54n1);
>
> return 0;
> --
> 1.7.2.3
>
>

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

2010-11-15 22:28:30

by Wolfram Sang

[permalink] [raw]

Subject: Re: [PATCH] media: video: do not clear 'driver' from an i2c_client

---

On Wed, Nov 10, 2010 at 03:14:13PM +0100, Wolfram Sang wrote:
> The i2c-core does this already.
>
> Reported-by: Jean Delvare <[email protected]>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
>
> Not sure if this should go via i2c or media?

Okay, as Jean did not pick it up in his latest pull request, I guess this means
it shall go via the media-tree? :) Mauro, will you pick it up?

--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |

---

Attachments:

(No filename) (557.00 B)
signature.asc (197.00 B)
Digital signature Download all attachments

2010-11-16 10:35:12

by Jean Delvare

[permalink] [raw]

Subject: Re: [PATCH] media: video: do not clear 'driver' from an i2c_client

---

Hi Wolfram,

Sorry for the late answer.

On Mon, 15 Nov 2010 23:28:15 +0100, Wolfram Sang wrote:
> On Wed, Nov 10, 2010 at 03:14:13PM +0100, Wolfram Sang wrote:
> > The i2c-core does this already.
> >
> > Reported-by: Jean Delvare <[email protected]>
> > Signed-off-by: Wolfram Sang <[email protected]>
> > ---
> >
> > Not sure if this should go via i2c or media?
>
> Okay, as Jean did not pick it up in his latest pull request, I guess this means
> it shall go via the media-tree? :) Mauro, will you pick it up?

Yes I think it should go through Mauro's tree. I was simply waiting for
your other patch to get merged first (which happened yesterday),
because this patch depended on that one.

So:

Acked-by: Jean Delvare <[email protected]>

and Mauro please pick the patch in your tree.

Thanks,
--
Jean Delvare