summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorShubhrajyoti D <shubhrajyoti@ti.com>2012-01-04 19:45:28 +0530
committerWim Van Sebroeck <wim@iguana.be>2012-01-06 16:33:31 +0100
commite2bf7c4c22939bd83814d8da40a352d246030b1b (patch)
tree703eb367c33fc90dbe81b12003b84b992234ea9b /drivers/watchdog
parentdc3c56b703dad4aec8a9b3dd86f03a90d0c26a2d (diff)
downloadop-kernel-dev-e2bf7c4c22939bd83814d8da40a352d246030b1b.zip
op-kernel-dev-e2bf7c4c22939bd83814d8da40a352d246030b1b.tar.gz
watchdog: omap_wdt.c: fix the WDIOC_GETBOOTSTATUS ioctl if not implemented.
WDIOC_GETBOOTSTATUS ioctl is imlemented for cpu_is_omap16xx and cpu_is_omap24xx cpus only. For other cpus it falls through to WDIOC_KEEPALIVE. This patch prevents the fall through. Cc: sricharan <r.sricharan@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/omap_wdt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 324f525..4b33e3f 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -232,6 +232,7 @@ static long omap_wdt_ioctl(struct file *file, unsigned int cmd,
if (cpu_is_omap24xx())
return put_user(omap_prcm_get_reset_sources(),
(int __user *)arg);
+ return put_user(0, (int __user *)arg);
case WDIOC_KEEPALIVE:
pm_runtime_get_sync(wdev->dev);
spin_lock(&wdt_lock);
OpenPOWER on IntegriCloud