lkml.org 
[lkml]   [2015]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH V6 07/10] USB: f81232: fix error in f81232_carrier_raised()
    On Mon, Feb 16, 2015 at 03:57:59PM +0800, Peter Hung wrote:
    > 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 e70ec62..c87a3eb 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)

    Could you fix the separately before removing the unused defines and also
    add the missing locking?

    > return 1;
    > return 0;
    > }

    Thanks,
    Johan


    \
     
     \ /
      Last update: 2015-02-17 11:21    [W:4.400 / U:1.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site