← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to drivers/usb/serial/pl2303.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/serial/pl2303.c
96
96
        { USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) },
97
97
        { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) },
98
98
        { USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
99
 
        { USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
100
99
        { }                                     /* Terminating entry */
101
100
};
102
101
 
995
994
        /* overrun is special, not associated with a char */
996
995
        if (line_status & UART_OVERRUN_ERROR)
997
996
                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
998
 
 
999
 
        if (tty_flag == TTY_NORMAL && !(port->console && port->sysrq))
1000
 
                tty_insert_flip_string(tty, data, urb->actual_length);
1001
 
        else {
 
997
        if (port->console && port->sysrq) {
1002
998
                int i;
1003
999
                for (i = 0; i < urb->actual_length; ++i)
1004
1000
                        if (!usb_serial_handle_sysrq_char(tty, port, data[i]))
1005
1001
                                tty_insert_flip_char(tty, data[i], tty_flag);
1006
 
        }
 
1002
        } else
 
1003
                tty_insert_flip_string(tty, data, urb->actual_length);
1007
1004
        tty_flip_buffer_push(tty);
1008
1005
}
1009
1006