From 139a19b9a6037152e4abfcea92d14a622f61200f Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Wed, 4 Jan 2012 19:45:28 +0530
Subject: [PATCH] --- yaml --- r: 282218 b: refs/heads/master c:
 e2bf7c4c22939bd83814d8da40a352d246030b1b h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/omap_wdt.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22daac8e375a..a4362bb3fdf2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc3c56b703dad4aec8a9b3dd86f03a90d0c26a2d
+refs/heads/master: e2bf7c4c22939bd83814d8da40a352d246030b1b
diff --git a/trunk/drivers/watchdog/omap_wdt.c b/trunk/drivers/watchdog/omap_wdt.c
index 324f525ea8d2..4b33e3fd726b 100644
--- a/trunk/drivers/watchdog/omap_wdt.c
+++ b/trunk/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);