linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Colin Leitner <colin.leitner@googlemail.com>
To: gregkh@linuxfoundation.org, linux-serial@vger.kernel.org
Subject: [PATCH] pl2303: fixed handling of CS5 setting. 5 databits work now
Date: Sun, 3 Nov 2013 15:47:06 +0100	[thread overview]
Message-ID: <CAAMgOiUAwXNYbfAicgq+k0OZfKN8--pgR_-zCVSC2wm90bww0A@mail.gmail.com> (raw)

pl2303: fixed handling of CS5 setting. 5 databits work now

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.

Cc: stable@vger.kernel.org
Signed-off-by: Colin Leitner <colin.leitner@gmail.com>
---
 drivers/usb/serial/pl2303.c |   30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index bedf8e4..fd86357 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -522,23 +522,21 @@ static void pl2303_set_termios(struct tty_struct *tty,
                            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, spriv->type, buf);
-- 
1.7.10.4

             reply	other threads:[~2013-11-03 14:47 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-03 14:47 Colin Leitner [this message]
2013-11-03 17:04 ` [PATCH] pl2303: fixed handling of CS5 setting. 5 databits work now Johan Hovold
     [not found]   ` <CAMgPeKVinmcB7sDaTjU4LCA_AUY3QnxqoENBOmKsbpvk+9tDRw@mail.gmail.com>
2013-11-03 17:13     ` Johan Hovold
2013-11-03 21:54   ` Colin Leitner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAAMgOiUAwXNYbfAicgq+k0OZfKN8--pgR_-zCVSC2wm90bww0A@mail.gmail.com \
    --to=colin.leitner@googlemail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-serial@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).