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 V5 7/8] USB: f81232: fix error in f81232_carrier_raised()
Date: Fri, 6 Feb 2015 17:46:53 +0800 [thread overview]
Message-ID: <1423216014-571-8-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
In-Reply-To: <1423216014-571-1-git-send-email-hpeter+linux_kernel@gmail.com>
It's should compared with UART_MSR_DCD, not UART_DCD.
also we clean-up some non-used define to avoid impropriety use.
Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
drivers/usb/serial/f81232.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 4dddb44..07abf0c 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -47,20 +47,6 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define MODEM_CONTROL_REGISTER (0x04 + SERIAL_BASE_ADDRESS)
#define MODEM_STATUS_REGISTER (0x06 + SERIAL_BASE_ADDRESS)
-#define CONTROL_DTR 0x01
-#define CONTROL_RTS 0x02
-
-#define UART_STATE 0x08
-#define UART_STATE_TRANSIENT_MASK 0x74
-#define UART_DCD 0x01
-#define UART_DSR 0x02
-#define UART_BREAK_ERROR 0x04
-#define UART_RING 0x08
-#define UART_FRAME_ERROR 0x10
-#define UART_PARITY_ERROR 0x20
-#define UART_OVERRUN_ERROR 0x40
-#define UART_CTS 0x80
-
struct f81232_private {
spinlock_t lock;
u8 line_control;
@@ -511,7 +497,7 @@ static void f81232_dtr_rts(struct usb_serial_port *port, int on)
static int f81232_carrier_raised(struct usb_serial_port *port)
{
struct f81232_private *priv = usb_get_serial_port_data(port);
- if (priv->modem_status & UART_DCD)
+ if (priv->modem_status & UART_MSR_DCD)
return 1;
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2015-02-06 9:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-06 9:46 [PATCH V5 0/8] USB: f81534: v5 patch Peter Hung
2015-02-06 9:46 ` [PATCH V5 1/8] USB: f81232: Rename private struct member name Peter Hung
2015-02-06 9:46 ` [PATCH V5 2/8] USB: f81232: implement read IIR/MSR with endpoint Peter Hung
2015-02-06 9:46 ` [PATCH V5 3/8] USB: f81232: implement RX bulk-in ep Peter Hung
2015-02-16 12:59 ` Johan Hovold
2015-02-16 13:02 ` Johan Hovold
2015-02-06 9:46 ` [PATCH V5 4/8] USB: f81232: implement set_termios Peter Hung
2015-02-06 9:46 ` [PATCH V5 5/8] USB: f81232: implement MCR/MSR function Peter Hung
2015-02-06 9:46 ` [PATCH V5 6/8] USB: f81232: clarify f81232_ioctl() Peter Hung
2015-02-06 12:21 ` Sergei Shtylyov
2015-02-09 6:59 ` Peter Hung
2015-02-09 8:42 ` Johan Hovold
2015-02-10 2:35 ` Peter Hung
2015-02-06 9:46 ` Peter Hung [this message]
2015-02-06 9:46 ` [PATCH V5 8/8] USB: f81232: modify/add author Peter Hung
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=1423216014-571-8-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 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).