* [PATCH] pl2303: fixed handling of CS5 setting. 5 databits work now
@ 2013-11-03 14:47 Colin Leitner
2013-11-03 17:04 ` Johan Hovold
0 siblings, 1 reply; 4+ messages in thread
From: Colin Leitner @ 2013-11-03 14:47 UTC (permalink / raw)
To: gregkh, linux-serial
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] pl2303: fixed handling of CS5 setting. 5 databits work now
2013-11-03 14:47 [PATCH] pl2303: fixed handling of CS5 setting. 5 databits work now Colin Leitner
@ 2013-11-03 17:04 ` Johan Hovold
[not found] ` <CAMgPeKVinmcB7sDaTjU4LCA_AUY3QnxqoENBOmKsbpvk+9tDRw@mail.gmail.com>
2013-11-03 21:54 ` Colin Leitner
0 siblings, 2 replies; 4+ messages in thread
From: Johan Hovold @ 2013-11-03 17:04 UTC (permalink / raw)
To: Colin Leitner; +Cc: gregkh, linux-serial, linux-usb
[ Please make sure to CC the linux-usb list. ]
On Sun, Nov 03, 2013 at 03:47:06PM +0100, Colin Leitner wrote:
> pl2303: fixed handling of CS5 setting. 5 databits work now
No need to repeat the subject line in the body, and please add a
"USB:"-prefix and drop the "5 databits work now" from the subject.
> 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.
Good catch!
Unfortunately, the patch is white-space damaged. You should use tabs for
indentation. Please run your patches through checkpatch.pl before
submitting (or fix your mail client if that's where the problem is).
> 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:
You can drop the default-case as CSIZE is a two-bit mask.
Care to respin?
Thanks,
Johan
> + 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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-serial" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-03 21:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-03 14:47 [PATCH] pl2303: fixed handling of CS5 setting. 5 databits work now Colin Leitner
2013-11-03 17:04 ` Johan Hovold
[not found] ` <CAMgPeKVinmcB7sDaTjU4LCA_AUY3QnxqoENBOmKsbpvk+9tDRw@mail.gmail.com>
2013-11-03 17:13 ` Johan Hovold
2013-11-03 21:54 ` Colin Leitner
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).