diff options
| author | Dima Zavin <dima@android.com> | 2010-10-21 15:00:17 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2010-10-21 15:00:17 -0700 |
| commit | 5ff1b9cdb1791cab2759a2a073f0ba6b24579bc3 (patch) | |
| tree | b375bea8dbd645df03a14a74481918b4f6657867 /drivers/regulator/isl6271a-regulator.c | |
| parent | d3c5752794d700393fc3ba5ad4eb4b09c269b23c (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into android-2.6.36
Diffstat (limited to 'drivers/regulator/isl6271a-regulator.c')
| -rw-r--r-- | drivers/regulator/isl6271a-regulator.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c index d61ecb885a8c..b8cc6389a541 100644 --- a/drivers/regulator/isl6271a-regulator.c +++ b/drivers/regulator/isl6271a-regulator.c @@ -191,8 +191,6 @@ static int __devexit isl6271a_remove(struct i2c_client *i2c) struct isl_pmic *pmic = i2c_get_clientdata(i2c); int i; - i2c_set_clientdata(i2c, NULL); - for (i = 0; i < 3; i++) regulator_unregister(pmic->rdev[i]); |