lkml.org 
[lkml]   [2010]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] sonypi: Kill off the BKL in the ioctl
Date
And another thats been ignored for several months

--

All the internal logic is protected properly by the existing mutex locking

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

drivers/char/sonypi.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 0798754..6a574bf 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -955,8 +955,8 @@ static unsigned int sonypi_misc_poll(struct file *file, poll_table *wait)
return 0;
}

-static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
- unsigned int cmd, unsigned long arg)
+static long sonypi_misc_ioctl(struct file *fp,
+ unsigned int cmd, unsigned long arg)
{
int ret = 0;
void __user *argp = (void __user *)arg;
@@ -1074,7 +1074,7 @@ static const struct file_operations sonypi_misc_fops = {
.open = sonypi_misc_open,
.release = sonypi_misc_release,
.fasync = sonypi_misc_fasync,
- .ioctl = sonypi_misc_ioctl,
+ .unlocked_ioctl = sonypi_misc_ioctl,
};

static struct miscdevice sonypi_misc_device = {


\
 
 \ /
  Last update: 2010-01-04 17:47    [W:0.699 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site