* [PATCH] sonypi: Eliminate BKL in ioctls
@ 2008-05-22 20:53 Alan Cox
0 siblings, 0 replies; only message in thread
From: Alan Cox @ 2008-05-22 20:53 UTC (permalink / raw)
To: linux-kernel, malattia
Signed-off-by: Alan Cox <alan@redhat.com>
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 00e48e2..7f97783 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -1981,8 +1981,8 @@ static int ec_read16(u8 addr, u16 *value)
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;
@@ -2116,7 +2116,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 = {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-22 21:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-22 20:53 [PATCH] sonypi: Eliminate BKL in ioctls Alan Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox