git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
regulator
/
mc13783-regulator.c
diff --git
a/drivers/regulator/mc13783-regulator.c
b/drivers/regulator/mc13783-regulator.c
index
a681f5e
..
ad036dd
100644
(file)
--- 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;
}