diff options
Diffstat (limited to 'drivers/watchdog/sa1100_wdt.c')
-rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 869d538c02f9..27d6898a7c98 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c | |||
@@ -107,6 +107,11 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd, | |||
107 | ret = put_user(boot_status, p); | 107 | ret = put_user(boot_status, p); |
108 | break; | 108 | break; |
109 | 109 | ||
110 | case WDIOC_KEEPALIVE: | ||
111 | OSMR3 = OSCR + pre_margin; | ||
112 | ret = 0; | ||
113 | break; | ||
114 | |||
110 | case WDIOC_SETTIMEOUT: | 115 | case WDIOC_SETTIMEOUT: |
111 | ret = get_user(time, p); | 116 | ret = get_user(time, p); |
112 | if (ret) | 117 | if (ret) |
@@ -124,11 +129,6 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd, | |||
124 | case WDIOC_GETTIMEOUT: | 129 | case WDIOC_GETTIMEOUT: |
125 | ret = put_user(pre_margin / OSCR_FREQ, p); | 130 | ret = put_user(pre_margin / OSCR_FREQ, p); |
126 | break; | 131 | break; |
127 | |||
128 | case WDIOC_KEEPALIVE: | ||
129 | OSMR3 = OSCR + pre_margin; | ||
130 | ret = 0; | ||
131 | break; | ||
132 | } | 132 | } |
133 | return ret; | 133 | return ret; |
134 | } | 134 | } |