diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:44:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:44:43 -0400 |
commit | ceadda057c000fa82e6bbe508923d8181414dea7 (patch) | |
tree | c57eeb217dba5d74c3e46d483f10714f5ac7c518 /drivers/media/video/rj54n1cb0c.c | |
parent | 95619be590638bd48469ac81c0f6236f349f5640 (diff) | |
parent | fbae3fb1546e199ab0cd185348f8124411a1ca9d (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: Remove all i2c_set_clientdata(client, NULL) in drivers
i2c/busses: Move two drivers to embedded section
i2c: Rename i2c_check_addr to i2c_check_addr_busy
i2c: Document reserved I2C addresses
i2c: Check for address validity on client registration
i2c: Share the I2C device presence detection code
Documentation/i2c: Checkpatch cleanup
Diffstat (limited to 'drivers/media/video/rj54n1cb0c.c')
-rw-r--r-- | drivers/media/video/rj54n1cb0c.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c index bbd9c11e2c5..2c3b58c99e1 100644 --- a/drivers/media/video/rj54n1cb0c.c +++ b/drivers/media/video/rj54n1cb0c.c | |||
@@ -1444,7 +1444,6 @@ static int rj54n1_probe(struct i2c_client *client, | |||
1444 | ret = rj54n1_video_probe(icd, client, rj54n1_priv); | 1444 | ret = rj54n1_video_probe(icd, client, rj54n1_priv); |
1445 | if (ret < 0) { | 1445 | if (ret < 0) { |
1446 | icd->ops = NULL; | 1446 | icd->ops = NULL; |
1447 | i2c_set_clientdata(client, NULL); | ||
1448 | kfree(rj54n1); | 1447 | kfree(rj54n1); |
1449 | return ret; | 1448 | return ret; |
1450 | } | 1449 | } |
@@ -1461,7 +1460,6 @@ static int rj54n1_remove(struct i2c_client *client) | |||
1461 | icd->ops = NULL; | 1460 | icd->ops = NULL; |
1462 | if (icl->free_bus) | 1461 | if (icl->free_bus) |
1463 | icl->free_bus(icl); | 1462 | icl->free_bus(icl); |
1464 | i2c_set_clientdata(client, NULL); | ||
1465 | client->driver = NULL; | 1463 | client->driver = NULL; |
1466 | kfree(rj54n1); | 1464 | kfree(rj54n1); |
1467 | 1465 | ||