diff options
| author | Alan Cox | 2009-01-02 14:48:56 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-01-02 19:19:42 +0100 |
| commit | 6b447f04a9aecdf2a30c1a97e4b034ac7931bb70 (patch) | |
| tree | 61a92b936c0c8e42ebf93e01acbc15aceb9bd864 /drivers/usb/serial/ftdi_sio.c | |
| parent | synclink_cs: Convert to tty_port (diff) | |
| download | kernel-qcow2-linux-6b447f04a9aecdf2a30c1a97e4b034ac7931bb70.tar.gz kernel-qcow2-linux-6b447f04a9aecdf2a30c1a97e4b034ac7931bb70.tar.xz kernel-qcow2-linux-6b447f04a9aecdf2a30c1a97e4b034ac7931bb70.zip | |
tty: Drop the lock_kernel in the private ioctl hook
We don't need the BKL here any more so it can go. In a couple of spots the
driver requirements are not clear so push the lock down into the driver.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index fb6f2933b01b..ef6cfa5a447f 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1054,6 +1054,8 @@ static int set_serial_info(struct tty_struct *tty, if (copy_from_user(&new_serial, newinfo, sizeof(new_serial))) return -EFAULT; + + lock_kernel(); old_priv = *priv; /* Do error checking and permission checking */ @@ -1069,8 +1071,10 @@ static int set_serial_info(struct tty_struct *tty, } if ((new_serial.baud_base != priv->baud_base) && - (new_serial.baud_base < 9600)) + (new_serial.baud_base < 9600)) { + unlock_kernel(); return -EINVAL; + } /* Make the changes - these are privileged changes! */ @@ -1098,8 +1102,11 @@ check_and_exit: (priv->flags & ASYNC_SPD_MASK)) || (((priv->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) && (old_priv.custom_divisor != priv->custom_divisor))) { + unlock_kernel(); change_speed(tty, port); } + else + unlock_kernel(); return 0; } /* set_serial_info */ |