diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/usb/serial/visor.c | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'drivers/usb/serial/visor.c')
-rw-r--r-- | drivers/usb/serial/visor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 11a48d874752..f5c3841d4843 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
@@ -763,10 +763,9 @@ static int generic_startup(struct usb_serial *serial) | |||
763 | int i; | 763 | int i; |
764 | 764 | ||
765 | for (i = 0; i < serial->num_ports; ++i) { | 765 | for (i = 0; i < serial->num_ports; ++i) { |
766 | priv = kmalloc (sizeof(*priv), GFP_KERNEL); | 766 | priv = kzalloc (sizeof(*priv), GFP_KERNEL); |
767 | if (!priv) | 767 | if (!priv) |
768 | return -ENOMEM; | 768 | return -ENOMEM; |
769 | memset (priv, 0x00, sizeof(*priv)); | ||
770 | spin_lock_init(&priv->lock); | 769 | spin_lock_init(&priv->lock); |
771 | usb_set_serial_port_data(serial->port[i], priv); | 770 | usb_set_serial_port_data(serial->port[i], priv); |
772 | } | 771 | } |