This is a note to let you know that I've just added the patch titled
USB: cp210x: fix up set_termios variables
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-cp210x-fix-up-set_termios-variables.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 34b76fcaee574017862ea3fa0efdcd77a9d0e57d Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Mon, 16 Jan 2012 00:36:49 +0100
Subject: USB: cp210x: fix up set_termios variables
From: Johan Hovold <[email protected]>
commit 34b76fcaee574017862ea3fa0efdcd77a9d0e57d upstream.
[Based on a patch from Johan, mangled by gregkh to keep things in line]
Fix up the variable usage in the set_termios call.
Signed-off-by: Johan Hovold <[email protected]>
Cc: Preston Fick <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/serial/cp210x.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -576,7 +576,8 @@ static void cp210x_set_termios(struct tt
struct usb_serial_port *port, struct ktermios *old_termios)
{
unsigned int cflag, old_cflag;
- unsigned int baud = 0, bits;
+ u32 baud;
+ unsigned int bits;
unsigned int modem_ctl[4];
dbg("%s - port %d", __func__, port->number);
@@ -593,7 +594,7 @@ static void cp210x_set_termios(struct tt
if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {
dbg("%s - Setting baud rate to %d baud", __func__,
baud);
- if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud, 4)) {
+ if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud,
sizeof(baud))) {
dbg("Baud rate requested not supported by device");
baud = tty_termios_baud_rate(old_termios);
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/usb-cp210x-call-generic-open-last-in-open.patch
queue-3.0/usb-cp210x-fix-cp2104-baudrate-usage.patch
queue-3.0/usb-cp210x-fix-up-set_termios-variables.patch
queue-3.0/usb-cp210x-do-not-map-baud-rates-to-b0.patch
queue-3.0/usb-cp210x-allow-more-baud-rates-above-1mbaud.patch
queue-3.0/usb-cp210x-initialise-baud-rate-at-open.patch
queue-3.0/usb-cp210x-clean-up-refactor-and-document-speed-handling.patch
queue-3.0/usb-ftdi_sio-fix-tiocsserial-baud_base-handling.patch
queue-3.0/usb-ftdi_sio-fix-initial-baud-rate.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
