mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
USB: sisusb: Push down the BKL
This is another case where the lock_kernel appears to be unneccessary and could be removed with a bit more investigative work Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
54592157c7
commit
49f1525546
1 changed files with 6 additions and 7 deletions
|
@ -2982,9 +2982,8 @@ sisusb_handle_command(struct sisusb_usb_data *sisusb, struct sisusb_command *y,
|
|||
return retval;
|
||||
}
|
||||
|
||||
static int
|
||||
sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
static long
|
||||
sisusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct sisusb_usb_data *sisusb;
|
||||
struct sisusb_info x;
|
||||
|
@ -2995,6 +2994,7 @@ sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
|
|||
if (!(sisusb = (struct sisusb_usb_data *)file->private_data))
|
||||
return -ENODEV;
|
||||
|
||||
lock_kernel();
|
||||
mutex_lock(&sisusb->lock);
|
||||
|
||||
/* Sanity check */
|
||||
|
@ -3053,6 +3053,7 @@ sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
|
|||
|
||||
err_out:
|
||||
mutex_unlock(&sisusb->lock);
|
||||
unlock_kernel();
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
@ -3066,9 +3067,7 @@ sisusb_compat_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
|
|||
case SISUSB_GET_CONFIG_SIZE:
|
||||
case SISUSB_GET_CONFIG:
|
||||
case SISUSB_COMMAND:
|
||||
lock_kernel();
|
||||
retval = sisusb_ioctl(f->f_path.dentry->d_inode, f, cmd, arg);
|
||||
unlock_kernel();
|
||||
retval = sisusb_ioctl(f, cmd, arg);
|
||||
return retval;
|
||||
|
||||
default:
|
||||
|
@ -3087,7 +3086,7 @@ static const struct file_operations usb_sisusb_fops = {
|
|||
#ifdef SISUSB_NEW_CONFIG_COMPAT
|
||||
.compat_ioctl = sisusb_compat_ioctl,
|
||||
#endif
|
||||
.ioctl = sisusb_ioctl
|
||||
.unlocked_ioctl = sisusb_ioctl
|
||||
};
|
||||
|
||||
static struct usb_class_driver usb_sisusb_class = {
|
||||
|
|
Loading…
Reference in a new issue