diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /drivers/mfd/tps65010.c | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
Merge branch 'fix/misc' into topic/misc
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; |