1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index a7c3c4734d83..557411c6e7c7 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -1434,7 +1434,9 @@ static void rx_data_softint(void *private)
                 urb = wrap->urb;
 
                 if (tty && urb->actual_length) {
-                        if (urb->actual_length > TTY_FLIPBUF_SIZE - tty->flip.count) {
+                        int len = tty_buffer_request_room(tty, urb->actual_length);
+                        /* This stuff can go away now I suspect */
+                        if (unlikely(len < urb->actual_length)) {
                                 spin_lock_irqsave(&info->lock, flags);
                                 list_add(tmp, &info->rx_urb_q);
                                 spin_unlock_irqrestore(&info->lock, flags);
@@ -1442,11 +1444,8 @@ static void rx_data_softint(void *private)
                                 schedule_work(&info->rx_work);
                                 return;
                         }
-
-                        memcpy(tty->flip.char_buf_ptr, urb->transfer_buffer, urb->actual_length);
-                        tty->flip.char_buf_ptr += urb->actual_length;
-                        tty->flip.count += urb->actual_length;
-                        sent += urb->actual_length;
+                        tty_insert_flip_string(tty, urb->transfer_buffer, len);
+                        sent += len;
                 }
 
                 urb->dev = port->serial->dev;