aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/ixp4xx_wdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog/ixp4xx_wdt.c')
-rw-r--r--drivers/watchdog/ixp4xx_wdt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 1bafd7b58ca5..b94713e4773d 100644
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -117,6 +117,11 @@ static long ixp4xx_wdt_ioctl(struct file *file, unsigned int cmd,
117 ret = put_user(boot_status, (int *)arg); 117 ret = put_user(boot_status, (int *)arg);
118 break; 118 break;
119 119
120 case WDIOC_KEEPALIVE:
121 wdt_enable();
122 ret = 0;
123 break;
124
120 case WDIOC_SETTIMEOUT: 125 case WDIOC_SETTIMEOUT:
121 ret = get_user(time, (int *)arg); 126 ret = get_user(time, (int *)arg);
122 if (ret) 127 if (ret)
@@ -134,11 +139,6 @@ static long ixp4xx_wdt_ioctl(struct file *file, unsigned int cmd,
134 case WDIOC_GETTIMEOUT: 139 case WDIOC_GETTIMEOUT:
135 ret = put_user(heartbeat, (int *)arg); 140 ret = put_user(heartbeat, (int *)arg);
136 break; 141 break;
137
138 case WDIOC_KEEPALIVE:
139 wdt_enable();
140 ret = 0;
141 break;
142 } 142 }
143 return ret; 143 return ret;
144} 144}