USB: ssu100: fix overrun-error reporting

commit 75bcbf29c284dd0154c3e895a0bd1ef0e796160e upstream.

Fix reporting of overrun errors, which should only be reported once
using the inserted null character.

Fixes: 6b8f1ca5581b ("USB: ssu100: set tty_flags in ssu100_process_packet")
Signed-off-by: Johan Hovold <johan@kernel.org>
[bwh: Backported to 3.2:
 - Use tty_port_tty_get() to look up tty_struct
 - Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index bf1f8ea..ad8e5f3 100644 (file)
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -599,10 +599,10 @@ 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) {

                        priv->icount.overrun++;
                        priv->icount.overrun++;

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

                }
        }
 
                }
        }
 


@@ -623,11 +623,8 @@ static int ssu100_process_packet(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(tty, 0, TTY_OVERRUN);
-               }

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