261aa79724cd820ccd285544eaae54e7fa693f72
[openwrt/svn-archive/archive.git] / target / linux / adm5120 / patches-3.3 / a11-adm5120_wdt-3.3-fixes.patch
1 --- a/drivers/watchdog/adm5120_wdt.c
2 +++ b/drivers/watchdog/adm5120_wdt.c
3 @@ -123,8 +123,7 @@ static ssize_t wdt_write(struct file *fi
4 return 0;
5 }
6
7 -static int wdt_ioctl(struct inode *inode, struct file *file,
8 - unsigned int cmd, unsigned long arg)
9 +static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
10 {
11 int new_timeout;
12 static struct watchdog_info ident = {
13 @@ -166,7 +165,7 @@ static const struct file_operations wdt_
14 .owner = THIS_MODULE,
15 .llseek = no_llseek,
16 .write = wdt_write,
17 - .ioctl = wdt_ioctl,
18 + .unlocked_ioctl = wdt_ioctl,
19 .open = wdt_open,
20 .release = wdt_release,
21 };