From 75167cfac2678b953da65a00151ac745514ce7fa Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 4 Jan 2010 16:25:02 +0000 Subject: [PATCH] --- yaml --- r: 186621 b: refs/heads/master c: 74e1cd4555c7b8d2fe9de657658f92f859427025 h: refs/heads/master i: 186619: 12a14a5fbda66a1716f06eff3c795ce537700671 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sep/sep_driver.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d1dbdd044c95..c66c8490ac39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db376005ab4abe4a57fd96c8e007cf5d3b2e22bf +refs/heads/master: 74e1cd4555c7b8d2fe9de657658f92f859427025 diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index a5d65b9afaab..92fa18655f87 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -2233,7 +2233,7 @@ static int sep_set_flow_id_handler(struct sep_device *sep, return error; } -static int sep_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) +static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { int error = 0; struct sep_device *sep = filp->private_data; @@ -2608,7 +2608,7 @@ static dev_t sep_devno; /* the files operations structure of the driver */ static struct file_operations sep_file_operations = { .owner = THIS_MODULE, - .ioctl = sep_ioctl, + .unlocked_ioctl = sep_ioctl, .poll = sep_poll, .open = sep_open, .release = sep_release,