From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Dec 2013 20:10:48 +0000 (-0800)
Subject: 3.12-stable patches
X-Git-Tag: v3.4.74~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59dd9bbba7436245e1ee62c7b4f45ce3314af96c;p=thirdparty%2Fkernel%2Fstable-queue.git

3.12-stable patches

added patches:
	usb-pl2303-fixed-handling-of-cs5-setting.patch
---

diff --git a/queue-3.12/series b/queue-3.12/series
index 867a77512b5..60257418024 100644
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -54,3 +54,4 @@ input-mousedev-allow-disabling-even-without-config_expert.patch
 mei-me-add-lynx-point-wellsburg-work-station-device-id.patch
 mei-add-9-series-pch-mei-device-ids.patch
 n_tty-fix-missing-newline-echo.patch
+usb-pl2303-fixed-handling-of-cs5-setting.patch
diff --git a/queue-3.12/usb-pl2303-fixed-handling-of-cs5-setting.patch b/queue-3.12/usb-pl2303-fixed-handling-of-cs5-setting.patch
new file mode 100644
index 00000000000..eb3cab3144f
--- /dev/null
+++ b/queue-3.12/usb-pl2303-fixed-handling-of-cs5-setting.patch
@@ -0,0 +1,65 @@
+From a313249937820f8b1996133fc285efbd6aad2c5b Mon Sep 17 00:00:00 2001
+From: Colin Leitner <colin.leitner@googlemail.com>
+Date: Mon, 4 Nov 2013 19:40:43 +0100
+Subject: USB: pl2303: fixed handling of CS5 setting
+
+From: Colin Leitner <colin.leitner@googlemail.com>
+
+commit a313249937820f8b1996133fc285efbd6aad2c5b upstream.
+
+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: Colin Leitner <colin.leitner@gmail.com>
+Signed-off-by: Johan Hovold <jhovold@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/pl2303.c |   30 ++++++++++++++----------------
+ 1 file changed, 14 insertions(+), 16 deletions(-)
+
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -361,23 +361,21 @@ static void pl2303_set_termios(struct tt
+ 			    0, 0, buf, 7, 100);
+ 	dev_dbg(&port->dev, "0xa1:0x21:0:0  %d - %7ph\n", i, buf);
+ 
+-	if (C_CSIZE(tty)) {
+-		switch (C_CSIZE(tty)) {
+-		case CS5:
+-			buf[6] = 5;
+-			break;
+-		case CS6:
+-			buf[6] = 6;
+-			break;
+-		case CS7:
+-			buf[6] = 7;
+-			break;
+-		default:
+-		case CS8:
+-			buf[6] = 8;
+-		}
+-		dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
++	switch (C_CSIZE(tty)) {
++	case CS5:
++		buf[6] = 5;
++		break;
++	case CS6:
++		buf[6] = 6;
++		break;
++	case CS7:
++		buf[6] = 7;
++		break;
++	default:
++	case CS8:
++		buf[6] = 8;
+ 	}
++	dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
+ 
+ 	/* For reference buf[0]:buf[3] baud rate value */
+ 	pl2303_encode_baudrate(tty, port, &buf[0]);