nwflash: Push down BKL
PATCH 1/1 nwflash: Push down BKL
Push the BKL down into the driver ready for the BKL ioctl removal
Signed-off-by Alan Cox <[email protected]>
drivers/char/nwflash.c +8 -4
@@ -95,8 +95,11 @@ static int get_flash_id(void)return c2; } -static int flash_ioctl (struct inode *inodep,struct file *filep,unsigned int cmd,unsigned long arg) +static long flash_ioctl (struct file *filep,unsigned int cmd, +unsigned long arg) { +long ret =0 ; +lock_kernel ();switch (cmd) {case CMD_WRITE_DISABLE : gbWriteBase64Enable =0 ;
@@ -114,9 +117,10 @@ static int flash_ioctl(struct inode *inodep, struct file *filep, unsigned int cmdefault : gbWriteBase64Enable =0 ; gbWriteEnable =0 ; -return -EINVAL ; + ret = -ENOTTY ; } -return 0 ; +unlock_kernel (); +return ret; } static ssize_t flash_read(struct file *file, char __user *buf, size_t size,
@@ -647,7 +651,7 @@ static const struct file_operations flash_fops = .llseek = flash_llseek, .read = flash_read, .write = flash_write, - .ioctl = flash_ioctl, + .unlocked_ioctl = flash_ioctl, }; static struct miscdevice flash_miscdev =
Quoted 1 line · Alan Cox
Push the BKL down into the driver ready for the BKL ioctl removal
I'm nervous about large changes to this driver, since it's possible to brick Netwinders with it, but this change is simple enough.
Quoted 1 line
Signed-off-by Alan Cox <[email protected]>
Acked-by Russell King <[email protected]>
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: