diff options
| -rw-r--r-- | scull/scull.h | 2 | ||||
| -rw-r--r-- | sculld/main.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scull/scull.h b/scull/scull.h index 5b513e4..532e431 100644 --- a/scull/scull.h +++ b/scull/scull.h @@ -128,7 +128,7 @@ ssize_t scull_read(struct file *filp, char __user *buf, size_t count, ssize_t scull_write(struct file *filp, const char __user *buf, size_t count, loff_t *f_pos); loff_t scull_llseek(struct file *filp, loff_t off, int whence); -int scull_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +long scull_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); /* diff --git a/sculld/main.c b/sculld/main.c index 1039d84..8a6ecb1 100644 --- a/sculld/main.c +++ b/sculld/main.c @@ -279,8 +279,7 @@ ssize_t sculld_write (struct file *filp, const char __user *buf, size_t count, * The ioctl() implementation */ -int sculld_ioctl (struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +long sculld_ioctl (struct file *filp, unsigned int cmd, unsigned long arg) { int err = 0, ret = 0, tmp; @@ -488,7 +487,7 @@ struct file_operations sculld_fops = { .llseek = sculld_llseek, .read = sculld_read, .write = sculld_write, - .ioctl = sculld_ioctl, + .unlocked_ioctl = sculld_ioctl, .mmap = sculld_mmap, .open = sculld_open, .release = sculld_release, |