diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:48:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:48:11 -0700 |
| commit | 34c1c460f82c809f20a2d378373d6aeb58c7808a (patch) | |
| tree | 267bc5258aeb7debb6f5de8617e1663389d6ca51 /drivers/regulator/max8660.c | |
| parent | do_sync_read/write() should set kiocb.ki_nbytes to be consistent (diff) | |
| parent | regulator: fix dangling pointers (diff) | |
| download | linux-dev-34c1c460f82c809f20a2d378373d6aeb58c7808a.tar.xz linux-dev-34c1c460f82c809f20a2d378373d6aeb58c7808a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: fix dangling pointers
lp3971: Fix BUCK_VOL_CHANGE_SHIFT logic
lp3971: Fix setting val for LDO2 and LDO4
regulator: Get rid of lockdep warning
regulator: handle kcalloc() failure
Regulators: max8925-regulator - clean up driver data after removal
Diffstat (limited to 'drivers/regulator/max8660.c')
| -rw-r--r-- | drivers/regulator/max8660.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index f12f1bb62138..47f90b2fc290 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c @@ -470,8 +470,8 @@ static int __devexit max8660_remove(struct i2c_client *client) for (i = 0; i < MAX8660_V_END; i++) if (rdev[i]) regulator_unregister(rdev[i]); - kfree(rdev); i2c_set_clientdata(client, NULL); + kfree(rdev); return 0; } |