Merge branch 'upstream'

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

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 11a48d8747526a31355eb306fdac9cbefa6103dd..f5c3841d4843f7dc1cec0d681ee62dd42dfad322 100644 (file)
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -763,10 +763,9 @@ static int generic_startup(struct usb_serial *serial)
        int i;
 
        for (i = 0; i < serial->num_ports; ++i) {
-               priv = kmalloc (sizeof(*priv), GFP_KERNEL);
+               priv = kzalloc (sizeof(*priv), GFP_KERNEL);
                if (!priv)
                        return -ENOMEM;
-               memset (priv, 0x00, sizeof(*priv));
                spin_lock_init(&priv->lock);
                usb_set_serial_port_data(serial->port[i], priv);
        }