diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
| commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
| tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/mfd/max8925-i2c.c | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/mfd/max8925-i2c.c')
| -rw-r--r-- | drivers/mfd/max8925-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c index e73f3f5252a..0219115e00c 100644 --- a/drivers/mfd/max8925-i2c.c +++ b/drivers/mfd/max8925-i2c.c | |||
| @@ -173,7 +173,6 @@ static int __devexit max8925_remove(struct i2c_client *client) | |||
| 173 | max8925_device_exit(chip); | 173 | max8925_device_exit(chip); |
| 174 | i2c_unregister_device(chip->adc); | 174 | i2c_unregister_device(chip->adc); |
| 175 | i2c_unregister_device(chip->rtc); | 175 | i2c_unregister_device(chip->rtc); |
| 176 | i2c_set_clientdata(chip->i2c, NULL); | ||
| 177 | kfree(chip); | 176 | kfree(chip); |
| 178 | return 0; | 177 | return 0; |
| 179 | } | 178 | } |