Merge branch 'x86/fixmap' into x86/devel

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / ch341.c

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 42582d49b69c8951391e6a0a03c48f15d3756662..1f7c86bd8297c85e21a72451c5abed5e647a38a2 100644 (file)
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -28,6 +28,7 @@ static int debug;
 
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x4348, 0x5523) },
+       { USB_DEVICE(0x1a86, 0x7523) },
        { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -130,7 +131,7 @@ static int ch341_get_status(struct usb_device *dev)
                return -ENOMEM;
 
        r = ch341_control_in(dev, 0x95, 0x0706, 0, buffer, size);
-       if ( r < 0)
+       if (r < 0)
                goto out;
 
        /* Not having the datasheet for the CH341, we ignore the bytes returned
@@ -318,9 +319,6 @@ static struct usb_serial_driver ch341_device = {
        },
        .id_table         = id_table,
        .usb_driver       = &ch341_driver,
-       .num_interrupt_in = NUM_DONT_CARE,
-       .num_bulk_in      = 1,
-       .num_bulk_out     = 1,
        .num_ports        = 1,
        .open             = ch341_open,
        .set_termios      = ch341_set_termios,