diff options
Diffstat (limited to 'drivers/usb/serial/ti_usb_3410_5052.c')
-rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 07400c0c8a8..ae98d8cbdbb 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
@@ -228,6 +228,7 @@ static int product_5052_count; | |||
228 | /* null entry */ | 228 | /* null entry */ |
229 | static struct usb_device_id ti_id_table_3410[1+TI_EXTRA_VID_PID_COUNT+1] = { | 229 | static struct usb_device_id ti_id_table_3410[1+TI_EXTRA_VID_PID_COUNT+1] = { |
230 | { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, | 230 | { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, |
231 | { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, | ||
231 | }; | 232 | }; |
232 | 233 | ||
233 | static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { | 234 | static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { |
@@ -239,6 +240,7 @@ static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { | |||
239 | 240 | ||
240 | static struct usb_device_id ti_id_table_combined[] = { | 241 | static struct usb_device_id ti_id_table_combined[] = { |
241 | { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, | 242 | { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, |
243 | { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, | ||
242 | { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) }, | 244 | { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) }, |
243 | { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, | 245 | { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, |
244 | { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, | 246 | { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, |
@@ -459,13 +461,12 @@ static int ti_startup(struct usb_serial *serial) | |||
459 | 461 | ||
460 | /* set up port structures */ | 462 | /* set up port structures */ |
461 | for (i = 0; i < serial->num_ports; ++i) { | 463 | for (i = 0; i < serial->num_ports; ++i) { |
462 | tport = kmalloc(sizeof(struct ti_port), GFP_KERNEL); | 464 | tport = kzalloc(sizeof(struct ti_port), GFP_KERNEL); |
463 | if (tport == NULL) { | 465 | if (tport == NULL) { |
464 | dev_err(&dev->dev, "%s - out of memory\n", __FUNCTION__); | 466 | dev_err(&dev->dev, "%s - out of memory\n", __FUNCTION__); |
465 | status = -ENOMEM; | 467 | status = -ENOMEM; |
466 | goto free_tports; | 468 | goto free_tports; |
467 | } | 469 | } |
468 | memset(tport, 0, sizeof(struct ti_port)); | ||
469 | spin_lock_init(&tport->tp_lock); | 470 | spin_lock_init(&tport->tp_lock); |
470 | tport->tp_uart_base_addr = (i == 0 ? TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR); | 471 | tport->tp_uart_base_addr = (i == 0 ? TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR); |
471 | tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0; | 472 | tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0; |