diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 09:40:27 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 09:40:27 -0800 |
| commit | ebb436a8ac135ab58731042022cd9c4b04bb4ccf (patch) | |
| tree | 56ef7ef145a2d9c50f8505177cc41baa307571ec | |
| parent | 5d472e4cc9d6565226cd8aba2007bf3e2dcfe91d (diff) | |
| download | longterm-queue-2.6.32-ebb436a8ac135ab58731042022cd9c4b04bb4ccf.tar.gz | |
fix up queue-2.6.32/usb-ftdi_sio-fix-initial-baud-rate.patch
| -rw-r--r-- | queue-2.6.32/usb-ftdi_sio-fix-initial-baud-rate.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/queue-2.6.32/usb-ftdi_sio-fix-initial-baud-rate.patch b/queue-2.6.32/usb-ftdi_sio-fix-initial-baud-rate.patch index 28a436f..4890050 100644 --- a/queue-2.6.32/usb-ftdi_sio-fix-initial-baud-rate.patch +++ b/queue-2.6.32/usb-ftdi_sio-fix-initial-baud-rate.patch @@ -18,19 +18,21 @@ Signed-off-by: Johan Hovold <jhovold@gmail.com> Tested-by: Roland Ramthun <mail@roland-ramthun.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c -index ff5a8e1..7dbdf1e 100644 +--- + drivers/usb/serial/ftdi_sio.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -1823,6 +1823,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port) +@@ -1868,6 +1868,7 @@ static int ftdi_submit_read_urb(struct u static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) - { + { /* ftdi_open */ + struct ktermios dummy; struct usb_device *dev = port->serial->dev; struct ftdi_private *priv = usb_get_serial_port_data(port); - int result; -@@ -1841,8 +1842,10 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) + unsigned long flags; +@@ -1895,8 +1896,10 @@ static int ftdi_open(struct tty_struct * This is same behaviour as serial.c/rs_open() - Kuba */ /* ftdi_set_termios will send usb control messages */ @@ -41,5 +43,5 @@ index ff5a8e1..7dbdf1e 100644 + ftdi_set_termios(tty, port, &dummy); + } - /* Start reading from the device */ - result = usb_serial_generic_open(tty, port); + /* Not throttled */ + spin_lock_irqsave(&port->lock, flags); |