diff options
| author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:51:48 +0100 |
|---|---|---|
| committer | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:51:48 +0100 |
| commit | 29f5aec11c2c41ae6c8873a70aa5fe00ba5c36b3 (patch) | |
| tree | 844da388b6ed84b7f4a5dcb49a9d63eefd6a321e | |
| parent | 5f027b40d7402b782e4f26bc98ae635d0de8d316 (diff) | |
| download | ldd3-29f5aec11c2c41ae6c8873a70aa5fe00ba5c36b3.tar.gz | |
scullp: BLK ioctl pushdown API change
| -rw-r--r-- | scullp/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scullp/main.c b/scullp/main.c index 0aba67d..20f7c3d 100644 --- a/scullp/main.c +++ b/scullp/main.c @@ -270,8 +270,7 @@ ssize_t scullp_write (struct file *filp, const char __user *buf, size_t count, * The ioctl() implementation */ -int scullp_ioctl (struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +long scullp_ioctl (struct file *filp, unsigned int cmd, unsigned long arg) { int err = 0, ret = 0, tmp; @@ -479,7 +478,7 @@ struct file_operations scullp_fops = { .llseek = scullp_llseek, .read = scullp_read, .write = scullp_write, - .ioctl = scullp_ioctl, + .unlocked_ioctl = scullp_ioctl, .mmap = scullp_mmap, .open = scullp_open, .release = scullp_release, |