---

yaml --- r: 288110 b: refs/heads/master c: 741b9c7 h: refs/heads/master v: v3
git-mirror · Feb 29, 2012 · 7b8e9ce · 7b8e9ce
1 parent 0912c6b
commit 7b8e9ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f599aaf00f6b5b35ea6af9e428eab8f894752efd
+refs/heads/master: 741b9c7da1abf2f96f69d232fbeef5aff1371be3
diff --git a/trunk/drivers/watchdog/booke_wdt.c b/trunk/drivers/watchdog/booke_wdt.c
@@ -198,9 +198,13 @@ static long booke_wdt_ioctl(struct file *file,
 		booke_wdt_period = tmp;
 #endif
 		booke_wdt_set();
-		return 0;
+		/* Fall */
 	case WDIOC_GETTIMEOUT:
+#ifdef	CONFIG_FSL_BOOKE
+		return put_user(period_to_sec(booke_wdt_period), p);
+#else
 		return put_user(booke_wdt_period, p);
+#endif
 	default:
 		return -ENOTTY;
 	}