From 18a6bce5302a43311da31ae0de7ddd5cad4b080e Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Wed, 10 Feb 2010 19:34:05 +0000 Subject: [PATCH] --- yaml --- r: 187033 b: refs/heads/master c: f538ed9ea0a54ba2121f35f52d63e4025c534909 h: refs/heads/master i: 187031: 131bc31968167cf3633faef93991a8f2896d050b v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/ts72xx_wdt.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fa53c084c898..a2bd5118c8cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66aaa7a5592c0d8ca768c77d15d561bd43f514d8 +refs/heads/master: f538ed9ea0a54ba2121f35f52d63e4025c534909 diff --git a/trunk/drivers/watchdog/ts72xx_wdt.c b/trunk/drivers/watchdog/ts72xx_wdt.c index c4a4d37f85af..565a2c3321e5 100644 --- a/trunk/drivers/watchdog/ts72xx_wdt.c +++ b/trunk/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; }