summaryrefslogtreecommitdiffstats
path: root/scullc
diff options
context:
space:
mode:
Diffstat (limited to 'scullc')
-rw-r--r--scullc/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/scullc/main.c b/scullc/main.c
index 5769f1a..814db02 100644
--- a/scullc/main.c
+++ b/scullc/main.c
@@ -271,8 +271,7 @@ ssize_t scullc_write (struct file *filp, const char __user *buf, size_t count,
* The ioctl() implementation
*/
-int scullc_ioctl (struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg)
+long scullc_ioctl (struct file *filp, unsigned int cmd, unsigned long arg)
{
int err = 0, ret = 0, tmp;
@@ -475,7 +474,7 @@ struct file_operations scullc_fops = {
.llseek = scullc_llseek,
.read = scullc_read,
.write = scullc_write,
- .ioctl = scullc_ioctl,
+ .unlocked_ioctl = scullc_ioctl,
.open = scullc_open,
.release = scullc_release,
.aio_read = scullc_aio_read,