Commit a3132499 authored by Colin Leitner's avatar Colin Leitner Committed by Greg Kroah-Hartman

USB: pl2303: fixed handling of CS5 setting

This patch fixes the CS5 setting on the PL2303 USB-to-serial devices. CS5 has a
value of 0 and the CSIZE setting has been skipped altogether by the enclosing
if. Tested on 3.11.6 and the scope shows the correct output after the fix has
been applied.

Tagged to be added to stable, because it fixes a user visible driver bug and is
simple enough to backport easily.
Signed-off-by: default avatarColin Leitner <colin.leitner@gmail.com>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8704211f
...@@ -361,23 +361,21 @@ static void pl2303_set_termios(struct tty_struct *tty, ...@@ -361,23 +361,21 @@ static void pl2303_set_termios(struct tty_struct *tty,
0, 0, buf, 7, 100); 0, 0, buf, 7, 100);
dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %7ph\n", i, buf); dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %7ph\n", i, buf);
if (C_CSIZE(tty)) { switch (C_CSIZE(tty)) {
switch (C_CSIZE(tty)) { case CS5:
case CS5: buf[6] = 5;
buf[6] = 5; break;
break; case CS6:
case CS6: buf[6] = 6;
buf[6] = 6; break;
break; case CS7:
case CS7: buf[6] = 7;
buf[6] = 7; break;
break; default:
default: case CS8:
case CS8: buf[6] = 8;
buf[6] = 8;
}
dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
} }
dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
/* For reference buf[0]:buf[3] baud rate value */ /* For reference buf[0]:buf[3] baud rate value */
pl2303_encode_baudrate(tty, port, &buf[0]); pl2303_encode_baudrate(tty, port, &buf[0]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment