diff options
Diffstat (limited to 'drivers/usb/serial/opticon.c')
-rw-r--r-- | drivers/usb/serial/opticon.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 773286672ec9..f37476e22684 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
@@ -55,7 +55,6 @@ static void opticon_bulk_callback(struct urb *urb) | |||
55 | int status = urb->status; | 55 | int status = urb->status; |
56 | struct tty_struct *tty; | 56 | struct tty_struct *tty; |
57 | int result; | 57 | int result; |
58 | int available_room = 0; | ||
59 | int data_length; | 58 | int data_length; |
60 | 59 | ||
61 | dbg("%s - port %d", __func__, port->number); | 60 | dbg("%s - port %d", __func__, port->number); |
@@ -96,13 +95,9 @@ static void opticon_bulk_callback(struct urb *urb) | |||
96 | /* real data, send it to the tty layer */ | 95 | /* real data, send it to the tty layer */ |
97 | tty = tty_port_tty_get(&port->port); | 96 | tty = tty_port_tty_get(&port->port); |
98 | if (tty) { | 97 | if (tty) { |
99 | available_room = tty_buffer_request_room(tty, | 98 | tty_insert_flip_string(tty, data, |
100 | data_length); | 99 | data_length); |
101 | if (available_room) { | 100 | tty_flip_buffer_push(tty); |
102 | tty_insert_flip_string(tty, data, | ||
103 | available_room); | ||
104 | tty_flip_buffer_push(tty); | ||
105 | } | ||
106 | tty_kref_put(tty); | 101 | tty_kref_put(tty); |
107 | } | 102 | } |
108 | } else { | 103 | } else { |