diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index ab74123d658e..82116f42e6fd 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
@@ -394,7 +394,9 @@ static int ti_startup(struct usb_serial *serial) | |||
394 | 394 | ||
395 | /* if we have only 1 configuration, download firmware */ | 395 | /* if we have only 1 configuration, download firmware */ |
396 | if (dev->descriptor.bNumConfigurations == 1) { | 396 | if (dev->descriptor.bNumConfigurations == 1) { |
397 | if ((status = ti_download_firmware(tdev)) != 0) | 397 | status = ti_download_firmware(tdev); |
398 | |||
399 | if (status != 0) | ||
398 | goto free_tdev; | 400 | goto free_tdev; |
399 | 401 | ||
400 | /* 3410 must be reset, 5052 resets itself */ | 402 | /* 3410 must be reset, 5052 resets itself */ |
@@ -1683,7 +1685,9 @@ static int ti_download_firmware(struct ti_device *tdev) | |||
1683 | /* try ID specific firmware first, then try generic firmware */ | 1685 | /* try ID specific firmware first, then try generic firmware */ |
1684 | sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor, | 1686 | sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor, |
1685 | dev->descriptor.idProduct); | 1687 | dev->descriptor.idProduct); |
1686 | if ((status = request_firmware(&fw_p, buf, &dev->dev)) != 0) { | 1688 | status = request_firmware(&fw_p, buf, &dev->dev); |
1689 | |||
1690 | if (status != 0) { | ||
1687 | buf[0] = '\0'; | 1691 | buf[0] = '\0'; |
1688 | if (dev->descriptor.idVendor == MTS_VENDOR_ID) { | 1692 | if (dev->descriptor.idVendor == MTS_VENDOR_ID) { |
1689 | switch (dev->descriptor.idProduct) { | 1693 | switch (dev->descriptor.idProduct) { |