diff options
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index c145e1ed8429..f3af81b4dd29 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -492,6 +492,7 @@ static struct usb_device_id id_table_combined [] = { | |||
492 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) }, | 492 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) }, |
493 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) }, | 493 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) }, |
494 | { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) }, | 494 | { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) }, |
495 | { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, | ||
495 | { }, /* Optional parameter entry */ | 496 | { }, /* Optional parameter entry */ |
496 | { } /* Terminating entry */ | 497 | { } /* Terminating entry */ |
497 | }; | 498 | }; |
@@ -1141,12 +1142,11 @@ static int ftdi_sio_attach (struct usb_serial *serial) | |||
1141 | 1142 | ||
1142 | dbg("%s",__FUNCTION__); | 1143 | dbg("%s",__FUNCTION__); |
1143 | 1144 | ||
1144 | priv = kmalloc(sizeof(struct ftdi_private), GFP_KERNEL); | 1145 | priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL); |
1145 | if (!priv){ | 1146 | if (!priv){ |
1146 | err("%s- kmalloc(%Zd) failed.", __FUNCTION__, sizeof(struct ftdi_private)); | 1147 | err("%s- kmalloc(%Zd) failed.", __FUNCTION__, sizeof(struct ftdi_private)); |
1147 | return -ENOMEM; | 1148 | return -ENOMEM; |
1148 | } | 1149 | } |
1149 | memset(priv, 0, sizeof(*priv)); | ||
1150 | 1150 | ||
1151 | spin_lock_init(&priv->rx_lock); | 1151 | spin_lock_init(&priv->rx_lock); |
1152 | init_waitqueue_head(&priv->delta_msr_wait); | 1152 | init_waitqueue_head(&priv->delta_msr_wait); |