Skip to content

Commit

Permalink
[media] media: video: do not clear 'driver' from an i2c_client
Browse files Browse the repository at this point in the history
The i2c-core does this already.

Reported-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Wolfram Sang authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent 9a9dcb4 commit c0ff9f4
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/media/video/imx074.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ static int imx074_remove(struct i2c_client *client)
icd->ops = NULL;
if (icl->free_bus)
icl->free_bus(icl);
client->driver = NULL;
i2c_set_clientdata(client, NULL);
kfree(priv);

return 0;
Expand Down
1 change: 0 additions & 1 deletion drivers/media/video/mt9m001.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/media/video/mt9m111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/media/video/mt9t031.c
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,6 @@ static int mt9t031_remove(struct i2c_client *client)

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

return 0;
Expand Down
1 change: 0 additions & 1 deletion drivers/media/video/mt9v022.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/media/video/rj54n1cb0c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c0ff9f4

Please sign in to comment.