diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 22:44:43 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 22:44:43 (GMT) |
commit | ceadda057c000fa82e6bbe508923d8181414dea7 (patch) | |
tree | c57eeb217dba5d74c3e46d483f10714f5ac7c518 /drivers/mtd | |
parent | 95619be590638bd48469ac81c0f6236f349f5640 (diff) | |
parent | fbae3fb1546e199ab0cd185348f8124411a1ca9d (diff) | |
download | linux-ceadda057c000fa82e6bbe508923d8181414dea7.tar.xz |
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/mtd')
-rw-r--r-- | drivers/mtd/maps/pismo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index eb476b7..f4ce273 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c @@ -234,7 +234,6 @@ static int __devexit pismo_remove(struct i2c_client *client) /* FIXME: set_vpp needs saner arguments */ pismo_setvpp_remove_fix(pismo); - i2c_set_clientdata(client, NULL); kfree(pismo); return 0; @@ -286,7 +285,6 @@ static int __devinit pismo_probe(struct i2c_client *client, return 0; exit_free: - i2c_set_clientdata(client, NULL); kfree(pismo); return ret; } |