diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2010-04-27 04:24:11 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2010-05-25 05:04:06 -0400 |
commit | 8b18085a92c72fe1754481890e9dfc600e736b1f (patch) | |
tree | c9f4f2178631dd536404c43fd8aa3c382b9090b5 /drivers | |
parent | 76550d3292ba1b0dd1ff0a13d78a2718eba599c7 (diff) |
watchdog: booke_wdt: fix ioctl status flags
The WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS ioctl calls return the WDIOF_* flags
and nothing else.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/watchdog/booke_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 801ead191499..3d49671cdf5a 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -137,12 +137,12 @@ static long booke_wdt_ioctl(struct file *file, | |||
137 | if (copy_to_user((void *)arg, &ident, sizeof(ident))) | 137 | if (copy_to_user((void *)arg, &ident, sizeof(ident))) |
138 | return -EFAULT; | 138 | return -EFAULT; |
139 | case WDIOC_GETSTATUS: | 139 | case WDIOC_GETSTATUS: |
140 | return put_user(ident.options, p); | 140 | return put_user(0, p); |
141 | case WDIOC_GETBOOTSTATUS: | 141 | case WDIOC_GETBOOTSTATUS: |
142 | /* XXX: something is clearing TSR */ | 142 | /* XXX: something is clearing TSR */ |
143 | tmp = mfspr(SPRN_TSR) & TSR_WRS(3); | 143 | tmp = mfspr(SPRN_TSR) & TSR_WRS(3); |
144 | /* returns 1 if last reset was caused by the WDT */ | 144 | /* returns CARDRESET if last reset was caused by the WDT */ |
145 | return (tmp ? 1 : 0); | 145 | return (tmp ? WDIOF_CARDRESET : 0); |
146 | case WDIOC_SETOPTIONS: | 146 | case WDIOC_SETOPTIONS: |
147 | if (get_user(tmp, p)) | 147 | if (get_user(tmp, p)) |
148 | return -EINVAL; | 148 | return -EINVAL; |