1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index c4a4d37f85af..565a2c3321e5 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -307,6 +307,10 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd,
                 error = copy_to_user(argp, &winfo, sizeof(winfo));
                 break;
 
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                return put_user(0, p);
+
         case WDIOC_KEEPALIVE:
                 ts72xx_wdt_kick(wdt);
                 break;
@@ -477,14 +481,14 @@ static __devexit int ts72xx_wdt_remove(struct platform_device *pdev)
         error = misc_deregister(&ts72xx_wdt_miscdev);
         platform_set_drvdata(pdev, NULL);
 
-        iounmap(wdt->control_reg);
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, resource_size(res));
-
         iounmap(wdt->feed_reg);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         release_mem_region(res->start, resource_size(res));
 
+        iounmap(wdt->control_reg);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, resource_size(res));
+
         kfree(wdt);
         return error;
 }