diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2010-11-15 22:40:38 +0100 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2010-11-15 22:40:38 +0100 |
commit | dc6641be0ea8819ef095fdcefc2b695611999a21 (patch) | |
tree | 24ec163d5ec01cd7b65811b738a3024ea6c5fef1 /drivers/media/video | |
parent | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/... (diff) | |
download | linux-dc6641be0ea8819ef095fdcefc2b695611999a21.tar.xz linux-dc6641be0ea8819ef095fdcefc2b695611999a21.zip |
i2c: Remove obsolete cleanup for clientdata
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit. This is obsolete meanwhile, so fix it and hope the word will spread.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Alan Cox <alan@linux.intel.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/imx074.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ov6650.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c index 380e459f899d..27b5dfdfbb93 100644 --- a/drivers/media/video/imx074.c +++ b/drivers/media/video/imx074.c @@ -451,7 +451,6 @@ static int imx074_probe(struct i2c_client *client, ret = imx074_video_probe(icd, client); if (ret < 0) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); return ret; } @@ -468,7 +467,6 @@ static int imx074_remove(struct i2c_client *client) icd->ops = NULL; if (icl->free_bus) icl->free_bus(icl); - i2c_set_clientdata(client, NULL); client->driver = NULL; kfree(priv); diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c index 31f19373bbae..cf93de988068 100644 --- a/drivers/media/video/ov6650.c +++ b/drivers/media/video/ov6650.c @@ -1174,7 +1174,6 @@ static int ov6650_probe(struct i2c_client *client, if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); } @@ -1185,7 +1184,6 @@ static int ov6650_remove(struct i2c_client *client) { struct ov6650 *priv = to_ov6650(client); - i2c_set_clientdata(client, NULL); kfree(priv); return 0; } |