diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/serial/ipaq.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/serial/ipaq.c')
| -rw-r--r-- | drivers/usb/serial/ipaq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index d6231c38813e..3fea9298eb15 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
| @@ -747,7 +747,6 @@ static void ipaq_read_bulk_callback(struct urb *urb) | |||
| 747 | 747 | ||
| 748 | tty = tty_port_tty_get(&port->port); | 748 | tty = tty_port_tty_get(&port->port); |
| 749 | if (tty && urb->actual_length) { | 749 | if (tty && urb->actual_length) { |
| 750 | tty_buffer_request_room(tty, urb->actual_length); | ||
| 751 | tty_insert_flip_string(tty, data, urb->actual_length); | 750 | tty_insert_flip_string(tty, data, urb->actual_length); |
| 752 | tty_flip_buffer_push(tty); | 751 | tty_flip_buffer_push(tty); |
| 753 | bytes_in += urb->actual_length; | 752 | bytes_in += urb->actual_length; |