Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / shwdt.c

diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index ea2154bfe5abdc4974005cfe597a1c2581295f87..5bca794577687046f4b978c58066f7e7ade7f516 100644 (file)
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -296,8 +296,6 @@ static int sh_wdt_remove(struct platform_device *pdev)
 {
        struct sh_wdt *wdt = platform_get_drvdata(pdev);
 
-       platform_set_drvdata(pdev, NULL);
-
        watchdog_unregister_device(&sh_wdt_dev);
 
        pm_runtime_disable(&pdev->dev);