summaryrefslogtreecommitdiff
path: root/drivers/staging/sep
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-01-04 16:25:02 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:40 -0800
commit74e1cd4555c7b8d2fe9de657658f92f859427025 (patch)
tree304f1ddfbdeb9eef4c5236f52f8a82052bd94112 /drivers/staging/sep
parentdb376005ab4abe4a57fd96c8e007cf5d3b2e22bf (diff)
Staging: sep: Fix use of legacy ioctl fop
SEP doesn't need lock_kernel. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/sep')
-rw-r--r--drivers/staging/sep/sep_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index a5d65b9afaab..92fa18655f87 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/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,