aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/pcwd_usb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog/pcwd_usb.c')
-rw-r--r--drivers/watchdog/pcwd_usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 825102a33910..bc399cf65cf7 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -368,8 +368,8 @@ static ssize_t usb_pcwd_write(struct file *file, const char __user *data,
368 return len; 368 return len;
369} 369}
370 370
371static int usb_pcwd_ioctl(struct inode *inode, struct file *file, 371static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
372 unsigned int cmd, unsigned long arg) 372 unsigned long arg)
373{ 373{
374 void __user *argp = (void __user *)arg; 374 void __user *argp = (void __user *)arg;
375 int __user *p = argp; 375 int __user *p = argp;
@@ -534,7 +534,7 @@ static const struct file_operations usb_pcwd_fops = {
534 .owner = THIS_MODULE, 534 .owner = THIS_MODULE,
535 .llseek = no_llseek, 535 .llseek = no_llseek,
536 .write = usb_pcwd_write, 536 .write = usb_pcwd_write,
537 .ioctl = usb_pcwd_ioctl, 537 .unlocked_ioctl = usb_pcwd_ioctl,
538 .open = usb_pcwd_open, 538 .open = usb_pcwd_open,
539 .release = usb_pcwd_release, 539 .release = usb_pcwd_release,
540}; 540};