diff options
Diffstat (limited to 'drivers/char/watchdog/wdt.c')
-rw-r--r-- | drivers/char/watchdog/wdt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c index 70be81e39a61..517fbd8643f8 100644 --- a/drivers/char/watchdog/wdt.c +++ b/drivers/char/watchdog/wdt.c | |||
@@ -225,14 +225,13 @@ static int wdt_get_temperature(int *temperature) | |||
225 | * wdt_interrupt: | 225 | * wdt_interrupt: |
226 | * @irq: Interrupt number | 226 | * @irq: Interrupt number |
227 | * @dev_id: Unused as we don't allow multiple devices. | 227 | * @dev_id: Unused as we don't allow multiple devices. |
228 | * @regs: Unused. | ||
229 | * | 228 | * |
230 | * Handle an interrupt from the board. These are raised when the status | 229 | * Handle an interrupt from the board. These are raised when the status |
231 | * map changes in what the board considers an interesting way. That means | 230 | * map changes in what the board considers an interesting way. That means |
232 | * a failure condition occurring. | 231 | * a failure condition occurring. |
233 | */ | 232 | */ |
234 | 233 | ||
235 | static irqreturn_t wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 234 | static irqreturn_t wdt_interrupt(int irq, void *dev_id) |
236 | { | 235 | { |
237 | /* | 236 | /* |
238 | * Read the status register see what is up and | 237 | * Read the status register see what is up and |
@@ -341,7 +340,7 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
341 | switch(cmd) | 340 | switch(cmd) |
342 | { | 341 | { |
343 | default: | 342 | default: |
344 | return -ENOIOCTLCMD; | 343 | return -ENOTTY; |
345 | case WDIOC_GETSUPPORT: | 344 | case WDIOC_GETSUPPORT: |
346 | return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0; | 345 | return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0; |
347 | 346 | ||