Commit 2b24ef09 authored by Alan Cox's avatar Alan Cox Committed by Len Brown
Browse files

sony-laptop: Eliminate BKL in ioctls



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarMattia Dongili <malattia@linux.it>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1cae7103
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -2224,8 +2224,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;
@@ -2359,7 +2359,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 = {