]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
USB: ftdi_sio: fix TIOCSSERIAL baud_base handling
authorJohan Hovold <jhovold@gmail.com>
Tue, 10 Jan 2012 22:33:37 +0000 (23:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Feb 2012 17:26:54 +0000 (09:26 -0800)
commit eb833a9e0972f60beb4ab8104ad7ef6bf30f02fc upstream.

Return EINVAL if new baud_base does not match the current one.

The baud_base is device specific and can not be changed. This restores
the old (pre-2005) behaviour which was changed due to a
misunderstanding regarding this fact (see
https://lkml.org/lkml/2005/1/20/84).

Reported-by: Torbjörn Lofterud <torbjorn@pi.nxs.se>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/ftdi_sio.c

index 5ce2cb919044c469acf6056c6b1a3c2fbc451081..dec7c21ff8854dc818181dcf0ef6c8f023a013b0 100644 (file)
@@ -1351,8 +1351,7 @@ static int set_serial_info(struct tty_struct *tty,
                goto check_and_exit;
        }
 
-       if ((new_serial.baud_base != priv->baud_base) &&
-           (new_serial.baud_base < 9600)) {
+       if (new_serial.baud_base != priv->baud_base) {
                unlock_kernel();
                return -EINVAL;
        }