evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rio: push down the BKL into the firmware ioctl handler

Browse source 
TTY side is already done.

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2008-07-25 01:48:14 -07:00 • committed by Linus Torvalds
parent 909d145f0d
commit f6759fdcfd
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/char/rio/rio_linux.c
View file

@ -179,7 +179,7 @@ static int rio_set_real_termios(void *ptr);
static void rio_hungup(void *ptr); static void rio_hungup(void *ptr);
static void rio_close(void *ptr); static void rio_close(void *ptr);
static int rio_chars_in_buffer(void *ptr); static int rio_chars_in_buffer(void *ptr);
static int rio_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static long rio_fw_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
static int rio_init_drivers(void); static int rio_init_drivers(void);
static void my_hd(void *addr, int len); static void my_hd(void *addr, int len);
@ -240,7 +240,7 @@ static struct real_driver rio_real_driver = {
static const struct file_operations rio_fw_fops = { static const struct file_operations rio_fw_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ioctl = rio_fw_ioctl, .unlocked_ioctl = rio_fw_ioctl,
}; };
static struct miscdevice rio_fw_device = { static struct miscdevice rio_fw_device = {
@ -560,13 +560,15 @@ static void rio_close(void *ptr)
static int rio_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) static long rio_fw_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
int rc = 0; int rc = 0;
func_enter(); func_enter();
/* The "dev" argument isn't used. */ /* The "dev" argument isn't used. */
lock_kernel();
rc = riocontrol(p, 0, cmd, arg, capable(CAP_SYS_ADMIN)); rc = riocontrol(p, 0, cmd, arg, capable(CAP_SYS_ADMIN));
unlock_kernel();
func_exit(); func_exit();
return rc; return rc;