From 7b8e9ce2c4279d164621c7e3752f028406e5b3c4 Mon Sep 17 00:00:00 2001
From: Dmitry Artamonow <mad_soft@inbox.ru>
Date: Thu, 26 Jan 2012 23:24:30 +0400
Subject: [PATCH] --- yaml --- r: 288110 b: refs/heads/master c:
 741b9c7da1abf2f96f69d232fbeef5aff1371be3 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/watchdog/booke_wdt.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2bd44846ed1e..cd279ddc256a 100644
--- 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
index 337265b47305..7c0fdfca2646 100644
--- 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;
 	}