diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 17:03:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 17:03:17 -0500 |
commit | fe9d1159b299642f9e1a9b56bbf67a24c31bb418 (patch) | |
tree | 530c6e41beb784adb16a1faae2839edbad2fbb7f /drivers/media/video | |
parent | e5c13537b0153010b4f65b9c55faa78a4c151c93 (diff) | |
parent | 2236baa75f704851d3cd3310569058151acb1f06 (diff) |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Sanity checks on adapter registration
i2c: Mark i2c_adapter.id as deprecated
i2c: Drivers shouldn't include <linux/i2c-id.h>
i2c: Delete unused adapter IDs
i2c: Remove obsolete cleanup for clientdata
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/imx074.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 1 | ||||
-rw-r--r-- | drivers/media/video/ov6650.c | 2 |
3 files changed, 0 insertions, 5 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, | |||
451 | ret = imx074_video_probe(icd, client); | 451 | ret = imx074_video_probe(icd, client); |
452 | if (ret < 0) { | 452 | if (ret < 0) { |
453 | icd->ops = NULL; | 453 | icd->ops = NULL; |
454 | i2c_set_clientdata(client, NULL); | ||
455 | kfree(priv); | 454 | kfree(priv); |
456 | return ret; | 455 | return ret; |
457 | } | 456 | } |
@@ -468,7 +467,6 @@ static int imx074_remove(struct i2c_client *client) | |||
468 | icd->ops = NULL; | 467 | icd->ops = NULL; |
469 | if (icl->free_bus) | 468 | if (icl->free_bus) |
470 | icl->free_bus(icl); | 469 | icl->free_bus(icl); |
471 | i2c_set_clientdata(client, NULL); | ||
472 | client->driver = NULL; | 470 | client->driver = NULL; |
473 | kfree(priv); | 471 | kfree(priv); |
474 | 472 | ||
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 5a000c65ae98..ce4a75375909 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
@@ -44,7 +44,6 @@ | |||
44 | #include <linux/errno.h> | 44 | #include <linux/errno.h> |
45 | #include <linux/slab.h> | 45 | #include <linux/slab.h> |
46 | #include <linux/i2c.h> | 46 | #include <linux/i2c.h> |
47 | #include <linux/i2c-id.h> | ||
48 | #include <linux/workqueue.h> | 47 | #include <linux/workqueue.h> |
49 | 48 | ||
50 | #include <media/ir-core.h> | 49 | #include <media/ir-core.h> |
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, | |||
1174 | 1174 | ||
1175 | if (ret) { | 1175 | if (ret) { |
1176 | icd->ops = NULL; | 1176 | icd->ops = NULL; |
1177 | i2c_set_clientdata(client, NULL); | ||
1178 | kfree(priv); | 1177 | kfree(priv); |
1179 | } | 1178 | } |
1180 | 1179 | ||
@@ -1185,7 +1184,6 @@ static int ov6650_remove(struct i2c_client *client) | |||
1185 | { | 1184 | { |
1186 | struct ov6650 *priv = to_ov6650(client); | 1185 | struct ov6650 *priv = to_ov6650(client); |
1187 | 1186 | ||
1188 | i2c_set_clientdata(client, NULL); | ||
1189 | kfree(priv); | 1187 | kfree(priv); |
1190 | return 0; | 1188 | return 0; |
1191 | } | 1189 | } |