---

yaml --- r: 282218 b: refs/heads/master c: e2bf7c4 h: refs/heads/master v: v3
git-mirror · Jan 6, 2012 · 139a19b · 139a19b
1 parent 7185936
commit 139a19b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);