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/mfd/tps65010.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/mfd/tps65010.c')
| -rw-r--r-- | drivers/mfd/tps65010.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c index 9b22a77f70f5..d0016b67d125 100644 --- a/drivers/mfd/tps65010.c +++ b/drivers/mfd/tps65010.c | |||
| @@ -530,7 +530,6 @@ static int __exit tps65010_remove(struct i2c_client *client) | |||
| 530 | cancel_delayed_work(&tps->work); | 530 | cancel_delayed_work(&tps->work); |
| 531 | flush_scheduled_work(); | 531 | flush_scheduled_work(); |
| 532 | debugfs_remove(tps->file); | 532 | debugfs_remove(tps->file); |
| 533 | i2c_set_clientdata(client, NULL); | ||
| 534 | kfree(tps); | 533 | kfree(tps); |
| 535 | the_tps = NULL; | 534 | the_tps = NULL; |
| 536 | return 0; | 535 | return 0; |