Merge branch 'topic/misc' into for-linus

[~andy/linux] / drivers / usb / serial / pl2303.c

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 1d33260de014f0ee3c39546567a2e61b867b7ebf..fc2d66f7f4eb0ce3410a066e3877155651398eff 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -91,7 +91,7 @@ static const struct usb_device_id id_table[] = {
        { USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
        { USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
        { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
-       { USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) },
+       { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
        { }                                     /* Terminating entry */
 };
 
@@ -360,9 +360,6 @@ static void pl2303_set_termios(struct tty_struct *tty,
                                tmp >>= 2;
                                buf[1] <<= 1;
                        }
-                       if (tmp > 256) {
-                               tmp %= 256;
-                       }
                        buf[0] = tmp;
                }
        }