From 330608e94a0912559bf28ede6b146a048e4cc880 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Tue, 27 Apr 2010 08:24:11 +0000
Subject: [PATCH] --- yaml --- r: 198371 b: refs/heads/master c:
 8b18085a92c72fe1754481890e9dfc600e736b1f h: refs/heads/master i:   198369:
 f1d6cb9a48b8a26762c0bf90d687a75ee67dfb4b   198367:
 7ab90f622b201a35f74281a8a9ec53062ddaf3da v: v3

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

diff --git a/[refs] b/[refs]
index 770f431ca61b..57701933029d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76550d3292ba1b0dd1ff0a13d78a2718eba599c7
+refs/heads/master: 8b18085a92c72fe1754481890e9dfc600e736b1f
diff --git a/trunk/drivers/watchdog/booke_wdt.c b/trunk/drivers/watchdog/booke_wdt.c
index 801ead191499..3d49671cdf5a 100644
--- a/trunk/drivers/watchdog/booke_wdt.c
+++ b/trunk/drivers/watchdog/booke_wdt.c
@@ -137,12 +137,12 @@ static long booke_wdt_ioctl(struct file *file,
 		if (copy_to_user((void *)arg, &ident, sizeof(ident)))
 			return -EFAULT;
 	case WDIOC_GETSTATUS:
-		return put_user(ident.options, p);
+		return put_user(0, p);
 	case WDIOC_GETBOOTSTATUS:
 		/* XXX: something is clearing TSR */
 		tmp = mfspr(SPRN_TSR) & TSR_WRS(3);
-		/* returns 1 if last reset was caused by the WDT */
-		return (tmp ? 1 : 0);
+		/* returns CARDRESET if last reset was caused by the WDT */
+		return (tmp ? WDIOF_CARDRESET : 0);
 	case WDIOC_SETOPTIONS:
 		if (get_user(tmp, p))
 			return -EINVAL;