diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-21 12:31:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-21 12:31:52 -0700 |
| commit | 458f8c895beba63851281dcdac3773685f0fae09 (patch) | |
| tree | dd5b7af8b221bc5755e8ce94b7145f6f0589cac4 /drivers | |
| parent | 255f41c59558a346d65a2012420a7573e36dc584 (diff) | |
| parent | 58d57658834faa0c19da35e84632f7b78846f69f (diff) | |
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:
mc13783-regulator: fix a memory leak in mc13783_regulator_remove
regulator: Let drivers know when they use the stub API
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/mc13783-regulator.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c index a681f5e8f78..ad036dd8da1 100644 --- a/drivers/regulator/mc13783-regulator.c +++ b/drivers/regulator/mc13783-regulator.c @@ -618,9 +618,12 @@ static int __devexit mc13783_regulator_remove(struct platform_device *pdev) dev_get_platdata(&pdev->dev); int i; + platform_set_drvdata(pdev, NULL); + for (i = 0; i < pdata->num_regulators; i++) regulator_unregister(priv->regulators[i]); + kfree(priv); return 0; } |