Merge git://www.linux-watchdog.org/linux-watchdog

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

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 464bf76842a49cfb4834880a35c513448b25576e..e12a797cb82099a7e58c8167ba5a3c9401eb1bab 100644 (file)
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -269,9 +269,8 @@ static int at91wdt_remove(struct platform_device *pdev)
        if (res)
                dev_warn(dev, "failed to unregister restart handler\n");
 
-       res = misc_deregister(&at91wdt_miscdev);
-       if (!res)
-               at91wdt_miscdev.parent = NULL;
+       misc_deregister(&at91wdt_miscdev);
+       at91wdt_miscdev.parent = NULL;
 
        return res;
 }