Merge tag 'pwm/for-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[cascardo/linux.git] / drivers / watchdog / twl4030_wdt.c

diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 0f03106..2d4535d 100644 (file)
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -90,10 +90,8 @@ static int twl4030_wdt_probe(struct platform_device *pdev)
        twl4030_wdt_stop(wdt);
 
        ret = watchdog_register_device(wdt);
-       if (ret) {
-               platform_set_drvdata(pdev, NULL);
+       if (ret)
                return ret;
-       }
 
        return 0;
 }
@@ -103,7 +101,6 @@ static int twl4030_wdt_remove(struct platform_device *pdev)
        struct watchdog_device *wdt = platform_get_drvdata(pdev);
 
        watchdog_unregister_device(wdt);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }