Merge branch 'drm-platform' into drm-testing

[pandora-kernel.git] / drivers / usb / serial / generic.c

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index fcd30b8..a817ced 100644 (file)
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -324,6 +324,9 @@ void usb_serial_generic_process_read_urb(struct urb *urb)
        char *ch = (char *)urb->transfer_buffer;
        int i;
 
+       if (!urb->actual_length)
+               return;
+
        tty = tty_port_tty_get(&port->port);
        if (!tty)
                return;