projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[WATCHDOG] unlocked_ioctl changes
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
rc32434_wdt.c
diff --git
a/drivers/watchdog/rc32434_wdt.c
b/drivers/watchdog/rc32434_wdt.c
index 6756bcb009ed9efecdd30f8d3b40bc3f76cc2892..c9c73b69c5e54d2b6bb079c8dd70c99d3ef38aa8 100644
(file)
--- a/
drivers/watchdog/rc32434_wdt.c
+++ b/
drivers/watchdog/rc32434_wdt.c
@@
-182,8
+182,8
@@
static ssize_t rc32434_wdt_write(struct file *file, const char *data,
return 0;
}
return 0;
}
-static
int rc32434_wdt_ioctl(struct inode *inode, struct file *file
,
-
unsigned int cmd,
unsigned long arg)
+static
long rc32434_wdt_ioctl(struct file *file, unsigned int cmd
,
+
unsigned long arg)
{
void __user *argp = (void __user *)arg;
int new_timeout;
{
void __user *argp = (void __user *)arg;
int new_timeout;
@@
-242,7
+242,7
@@
static struct file_operations rc32434_wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = rc32434_wdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = rc32434_wdt_write,
- .
ioctl
= rc32434_wdt_ioctl,
+ .
unlocked_ioctl
= rc32434_wdt_ioctl,
.open = rc32434_wdt_open,
.release = rc32434_wdt_release,
};
.open = rc32434_wdt_open,
.release = rc32434_wdt_release,
};