USB: ssu100: fix overrun-error reporting

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

diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index a7fe664..70a098d 100644 (file)
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -490,10 +490,9 @@ static void ssu100_update_lsr(struct usb_serial_port *port, u8 lsr,
                        if (*tty_flag == TTY_NORMAL)
                                *tty_flag = TTY_FRAME;
                }
                        if (*tty_flag == TTY_NORMAL)
                                *tty_flag = TTY_FRAME;
                }

-               if (lsr & UART_LSR_OE){
+               if (lsr & UART_LSR_OE) {

                        port->icount.overrun++;
                        port->icount.overrun++;

-                       if (*tty_flag == TTY_NORMAL)
-                               *tty_flag = TTY_OVERRUN;
+                       tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);

                }
        }
 
                }
        }
 


@@ -511,12 +510,8 @@ static void ssu100_process_read_urb(struct urb *urb)
        if ((len >= 4) &&
            (packet[0] == 0x1b) && (packet[1] == 0x1b) &&
            ((packet[2] == 0x00) || (packet[2] == 0x01))) {
        if ((len >= 4) &&
            (packet[0] == 0x1b) && (packet[1] == 0x1b) &&
            ((packet[2] == 0x00) || (packet[2] == 0x01))) {

-               if (packet[2] == 0x00) {
+               if (packet[2] == 0x00)

                        ssu100_update_lsr(port, packet[3], &flag);
                        ssu100_update_lsr(port, packet[3], &flag);

-                       if (flag == TTY_OVERRUN)
-                               tty_insert_flip_char(&port->port, 0,
-                                               TTY_OVERRUN);
-               }

                if (packet[2] == 0x01)
                        ssu100_update_msr(port, packet[3]);
 
                if (packet[2] == 0x01)
                        ssu100_update_msr(port, packet[3]);