diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2008-09-18 12:26:15 +0000 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-09-23 08:12:30 +0000 |
| commit | 7275fc8c36dbad3a871f82b1f9f1f524688176ea (patch) | |
| tree | a232bba6b12be48ec644ebdb0d11fb34fa020fa6 /drivers/watchdog/rc32434_wdt.c | |
| parent | edf86c9b98b5162bed64a70f9424bd2dd58a717e (diff) | |
| download | lwn-7275fc8c36dbad3a871f82b1f9f1f524688176ea.tar.gz lwn-7275fc8c36dbad3a871f82b1f9f1f524688176ea.zip | |
[WATCHDOG] unlocked_ioctl changes
Fix some drivers so that they use the unlocked_ioctl call.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/rc32434_wdt.c')
| -rw-r--r-- | drivers/watchdog/rc32434_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index 6756bcb009ed..c9c73b69c5e5 100644 --- 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; } -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; @@ -242,7 +242,7 @@ static struct file_operations rc32434_wdt_fops = { .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, }; |