From: Peter Hung <hpeter@gmail.com>
To: johan@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, tom_tsai@fintek.com.tw,
peter_hong@fintek.com.tw,
Peter Hung <hpeter+linux_kernel@gmail.com>
Subject: [PATCH v3 5/5] usb: serial: implement CMSPAR for F81232
Date: Wed, 28 Jan 2015 13:58:32 +0800 [thread overview]
Message-ID: <1422424712-7561-1-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
This patch implement CMSPAR in set_termios,
and fix some warnning from checkpatch.pl
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
drivers/usb/serial/f81232.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 11a236b..79592d6 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -175,7 +175,7 @@ static void f81232_read_msr(struct f81232_private *priv)
static inline int update_mctrl(struct f81232_private *port_priv,
- unsigned int set, unsigned int clear)
+ unsigned int set, unsigned int clear)
{
struct usb_device *dev = port_priv->port->serial->dev;
u8 urb_value;
@@ -361,12 +361,21 @@ static void f81232_set_termios(struct tty_struct *tty,
if (cflag & PARENB) {
- if (cflag & PARODD)
- new_lcr |= UART_LCR_PARITY; /* odd */
- else
- new_lcr |= SERIAL_EVEN_PARITY; /* even */
+ if (cflag & CMSPAR) {
+ if (cflag & PARODD)
+ new_lcr |= (UART_LCR_PARITY | UART_LCR_SPAR);
+ else
+ new_lcr |= (SERIAL_EVEN_PARITY
+ | UART_LCR_SPAR);
+ } else {
+ if (cflag & PARODD)
+ new_lcr |= UART_LCR_PARITY; /* odd */
+ else
+ new_lcr |= SERIAL_EVEN_PARITY; /* even */
+ }
}
+
if (cflag & CSTOPB)
new_lcr |= UART_LCR_STOP;
else
@@ -445,7 +454,7 @@ static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port)
result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
if (result) {
- dev_err(&port->dev, "failed submitting interrupt urb, error %d\n",
+ dev_err(&port->dev, "failed submitting urb, error %d\n",
result);
return result;
}
--
1.9.1
next reply other threads:[~2015-01-28 5:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 5:58 Peter Hung [this message]
2015-01-28 12:31 ` [PATCH v3 5/5] usb: serial: implement CMSPAR for F81232 Sergei Shtylyov
2015-01-29 2:01 ` Peter Hung
2015-01-29 10:25 ` Sergei Shtylyov
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=1422424712-7561-1-git-send-email-hpeter+linux_kernel@gmail.com \
--to=hpeter@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpeter+linux_kernel@gmail.com \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter_hong@fintek.com.tw \
--cc=tom_tsai@fintek.com.tw \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.