[linux-usb-devel] [2.4 PATCH] Fix ftdi_sio custom baud rates bug

[Ian Abbott]

Hi,
Here is Rogier Wolff's patch to fix broken custom baud rate handling in 
the ftdi_sio driver, trivially backported from 2.6.11 to the 2.4 kernel. 
  Signed off by me in the attachment.

Please apply to 2.4.  TIA.
--
-=( Ian Abbott @ MEV Ltd.    E-mail: <[EMAIL PROTECTED]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-
This is Rogier Wolff's bug fix for custom baud rates in the ftdi_sio
driver which has already been applied in 2.6.11, but has not yet been
applied to the 2.4 kernel.
Here is Rogier's original description:

When using custom baud rates, the code does:


       if ((new_serial.baud_base != priv->baud_base) ||
            (new_serial.baud_base < 9600))
                return -EINVAL;

Which translates to english as:

 If you changed the baud-base, OR the new one is
 invalid, return invalid.

but it should be:

 If you changed the baud-base, OR the new one is
 invalid, return invalid.

Signed-off-by: Ian Abbott <[EMAIL PROTECTED]>

diff -ur a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.c	2005-04-29 12:07:20.000000000 +0100
+++ b/drivers/usb/serial/ftdi_sio.c	2005-05-03 11:15:25.000000000 +0100
@@ -1012,7 +1012,7 @@
 		goto check_and_exit;
 	}
 
-	if ((new_serial.baud_base != priv->baud_base) ||
+	if ((new_serial.baud_base != priv->baud_base) &&
 	    (new_serial.baud_base < 9600))
 		return -EINVAL;