diff options
Diffstat (limited to 'drivers/usb/serial/f81232.c')
-rw-r--r-- | drivers/usb/serial/f81232.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index c5dc233db2d9..669a2f2e7fdb 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c | |||
@@ -47,7 +47,7 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
47 | struct f81232_private { | 47 | struct f81232_private { |
48 | spinlock_t lock; | 48 | spinlock_t lock; |
49 | u8 line_control; | 49 | u8 line_control; |
50 | u8 line_status; | 50 | u8 modem_status; |
51 | }; | 51 | }; |
52 | 52 | ||
53 | static void f81232_update_line_status(struct usb_serial_port *port, | 53 | static void f81232_update_line_status(struct usb_serial_port *port, |
@@ -113,8 +113,8 @@ static void f81232_process_read_urb(struct urb *urb) | |||
113 | 113 | ||
114 | /* update line status */ | 114 | /* update line status */ |
115 | spin_lock_irqsave(&priv->lock, flags); | 115 | spin_lock_irqsave(&priv->lock, flags); |
116 | line_status = priv->line_status; | 116 | line_status = priv->modem_status; |
117 | priv->line_status &= ~UART_STATE_TRANSIENT_MASK; | 117 | priv->modem_status &= ~UART_STATE_TRANSIENT_MASK; |
118 | spin_unlock_irqrestore(&priv->lock, flags); | 118 | spin_unlock_irqrestore(&priv->lock, flags); |
119 | 119 | ||
120 | if (!urb->actual_length) | 120 | if (!urb->actual_length) |
@@ -241,7 +241,7 @@ static void f81232_dtr_rts(struct usb_serial_port *port, int on) | |||
241 | static int f81232_carrier_raised(struct usb_serial_port *port) | 241 | static int f81232_carrier_raised(struct usb_serial_port *port) |
242 | { | 242 | { |
243 | struct f81232_private *priv = usb_get_serial_port_data(port); | 243 | struct f81232_private *priv = usb_get_serial_port_data(port); |
244 | if (priv->line_status & UART_DCD) | 244 | if (priv->modem_status & UART_DCD) |
245 | return 1; | 245 | return 1; |
246 | return 0; | 246 | return 0; |
247 | } | 247 | } |