diff options
Diffstat (limited to 'drivers/watchdog/booke_wdt.c')
-rw-r--r-- | drivers/watchdog/booke_wdt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 06b7a17a60e7..c3b78a76f173 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -99,6 +99,15 @@ static long booke_wdt_ioctl(struct file *file, | |||
99 | tmp = mfspr(SPRN_TSR) & TSR_WRS(3); | 99 | tmp = mfspr(SPRN_TSR) & TSR_WRS(3); |
100 | /* returns 1 if last reset was caused by the WDT */ | 100 | /* returns 1 if last reset was caused by the WDT */ |
101 | return (tmp ? 1 : 0); | 101 | return (tmp ? 1 : 0); |
102 | case WDIOC_SETOPTIONS: | ||
103 | if (get_user(tmp, p)) | ||
104 | return -EINVAL; | ||
105 | if (tmp == WDIOS_ENABLECARD) { | ||
106 | booke_wdt_ping(); | ||
107 | break; | ||
108 | } else | ||
109 | return -EINVAL; | ||
110 | return 0; | ||
102 | case WDIOC_KEEPALIVE: | 111 | case WDIOC_KEEPALIVE: |
103 | booke_wdt_ping(); | 112 | booke_wdt_ping(); |
104 | return 0; | 113 | return 0; |
@@ -110,15 +119,6 @@ static long booke_wdt_ioctl(struct file *file, | |||
110 | return 0; | 119 | return 0; |
111 | case WDIOC_GETTIMEOUT: | 120 | case WDIOC_GETTIMEOUT: |
112 | return put_user(booke_wdt_period, p); | 121 | return put_user(booke_wdt_period, p); |
113 | case WDIOC_SETOPTIONS: | ||
114 | if (get_user(tmp, p)) | ||
115 | return -EINVAL; | ||
116 | if (tmp == WDIOS_ENABLECARD) { | ||
117 | booke_wdt_ping(); | ||
118 | break; | ||
119 | } else | ||
120 | return -EINVAL; | ||
121 | return 0; | ||
122 | default: | 122 | default: |
123 | return -ENOTTY; | 123 | return -ENOTTY; |
124 | } | 124 | } |