Merge branch 'upstream'

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

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 37c81c08faadcb19a15442ff2cfbd89126d09bbc..ccf746b27d4ea370758ad50fb2c3cbdf07eaaf92 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -77,6 +77,8 @@ static struct usb_device_id id_table [] = {
        { USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID) },
        { USB_DEVICE(SAGEM_VENDOR_ID, SAGEM_PRODUCT_ID) },
        { USB_DEVICE(LEADTEK_VENDOR_ID, LEADTEK_9531_PRODUCT_ID) },
+       { USB_DEVICE(SPEEDDRAGON_VENDOR_ID, SPEEDDRAGON_PRODUCT_ID) },
+       { USB_DEVICE(OTI_VENDOR_ID, OTI_PRODUCT_ID) },
        { }                                     /* Terminating entry */
 };
 
@@ -218,10 +220,9 @@ static int pl2303_startup (struct usb_serial *serial)
        dbg("device type: %d", type);
 
        for (i = 0; i < serial->num_ports; ++i) {
-               priv = kmalloc (sizeof (struct pl2303_private), GFP_KERNEL);
+               priv = kzalloc(sizeof(struct pl2303_private), GFP_KERNEL);
                if (!priv)
                        goto cleanup;
-               memset (priv, 0x00, sizeof (struct pl2303_private));
                spin_lock_init(&priv->lock);
                priv->buf = pl2303_buf_alloc(PL2303_BUF_SIZE);
                if (priv->buf == NULL) {
@@ -383,12 +384,11 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
                }
        }
 
-       buf = kmalloc (7, GFP_KERNEL);
+       buf = kzalloc (7, GFP_KERNEL);
        if (!buf) {
                dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__);
                return;
        }
-       memset (buf, 0x00, 0x07);
        
        i = usb_control_msg (serial->dev, usb_rcvctrlpipe (serial->dev, 0),
                             GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
@@ -828,6 +828,7 @@ static void pl2303_update_line_status(struct usb_serial_port *port,
        spin_lock_irqsave(&priv->lock, flags);
        priv->line_status = data[status_idx];
        spin_unlock_irqrestore(&priv->lock, flags);
+       wake_up_interruptible (&priv->delta_msr_wait);
 
 exit:
        return;