diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-01 14:17:07 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-01 14:17:07 +0400 |
| commit | bf7b8113e30e4dc2f587558f491b1596da5b2dd9 (patch) | |
| tree | effd851d53814a3da9334c4b3b9e1881ac17eba4 /drivers/regulator/wm831x-ldo.c | |
| parent | 71c2dca1ff46688fdf60f9f69dfa6bd9c8facfc0 (diff) | |
| parent | 405c54009c85cf03d459f5880744b0d4ebb892e4 (diff) | |
| download | linux-bf7b8113e30e4dc2f587558f491b1596da5b2dd9.tar.xz | |
Merge remote-tracking branch 'regulator/topic/drvdata' into regulator-next
Diffstat (limited to 'drivers/regulator/wm831x-ldo.c')
| -rw-r--r-- | drivers/regulator/wm831x-ldo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c index 1ec379a9a95c..9ff883f80878 100644 --- a/drivers/regulator/wm831x-ldo.c +++ b/drivers/regulator/wm831x-ldo.c @@ -338,8 +338,6 @@ static int wm831x_gp_ldo_remove(struct platform_device *pdev) { struct wm831x_ldo *ldo = platform_get_drvdata(pdev); - platform_set_drvdata(pdev, NULL); - free_irq(wm831x_irq(ldo->wm831x, platform_get_irq_byname(pdev, "UV")), ldo); regulator_unregister(ldo->regulator); |