Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / drivers / regulator / wm831x-ldo.c

diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 61e02ac..d2406c1 100644 (file)
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -371,6 +371,8 @@ static __devexit int wm831x_gp_ldo_remove(struct platform_device *pdev)
        struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
        struct wm831x *wm831x = ldo->wm831x;
 
+       platform_set_drvdata(pdev, NULL);
+
        wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), ldo);
        regulator_unregister(ldo->regulator);
        kfree(ldo);
@@ -383,6 +385,7 @@ static struct platform_driver wm831x_gp_ldo_driver = {
        .remove = __devexit_p(wm831x_gp_ldo_remove),
        .driver         = {
                .name   = "wm831x-ldo",
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -640,6 +643,7 @@ static struct platform_driver wm831x_aldo_driver = {
        .remove = __devexit_p(wm831x_aldo_remove),
        .driver         = {
                .name   = "wm831x-aldo",
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -811,6 +815,7 @@ static struct platform_driver wm831x_alive_ldo_driver = {
        .remove = __devexit_p(wm831x_alive_ldo_remove),
        .driver         = {
                .name   = "wm831x-alive-ldo",
+               .owner  = THIS_MODULE,
        },
 };