projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TTY: switch tty_flip_buffer_push
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
serial
/
ark3116.c
diff --git
a/drivers/usb/serial/ark3116.c
b/drivers/usb/serial/ark3116.c
index a88882c0e2376283a015d38732096472a50fb5f7..cbd904b8fba55f42ec07ed0d3a741878b516157c 100644
(file)
--- a/
drivers/usb/serial/ark3116.c
+++ b/
drivers/usb/serial/ark3116.c
@@
-674,7
+674,6
@@
static void ark3116_process_read_urb(struct urb *urb)
{
struct usb_serial_port *port = urb->context;
struct ark3116_private *priv = usb_get_serial_port_data(port);
{
struct usb_serial_port *port = urb->context;
struct ark3116_private *priv = usb_get_serial_port_data(port);
- struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer;
char tty_flag = TTY_NORMAL;
unsigned long flags;
unsigned char *data = urb->transfer_buffer;
char tty_flag = TTY_NORMAL;
unsigned long flags;
@@
-689,10
+688,6
@@
static void ark3116_process_read_urb(struct urb *urb)
if (!urb->actual_length)
return;
if (!urb->actual_length)
return;
- tty = tty_port_tty_get(&port->port);
- if (!tty)
- return;
-
if (lsr & UART_LSR_BRK_ERROR_BITS) {
if (lsr & UART_LSR_BI)
tty_flag = TTY_BREAK;
if (lsr & UART_LSR_BRK_ERROR_BITS) {
if (lsr & UART_LSR_BI)
tty_flag = TTY_BREAK;
@@
-703,12
+698,11
@@
static void ark3116_process_read_urb(struct urb *urb)
/* overrun is special, not associated with a char */
if (lsr & UART_LSR_OE)
/* overrun is special, not associated with a char */
if (lsr & UART_LSR_OE)
- tty_insert_flip_char(
tty
, 0, TTY_OVERRUN);
+ tty_insert_flip_char(
&port->port
, 0, TTY_OVERRUN);
}
}
- tty_insert_flip_string_fixed_flag(
tty
, data, tty_flag,
+ tty_insert_flip_string_fixed_flag(
&port->port
, data, tty_flag,
urb->actual_length);
urb->actual_length);
- tty_flip_buffer_push(tty);
- tty_kref_put(tty);
+ tty_flip_buffer_push(&port->port);
}
static struct usb_serial_driver ark3116_device = {
}
static struct usb_serial_driver ark3116_device = {