diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/atm/ueagle-atm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index bba4d3eabe0f..c5395246886d 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c | |||
@@ -667,12 +667,12 @@ static void uea_upload_pre_firmware(const struct firmware *fw_entry, void *conte | |||
667 | else | 667 | else |
668 | uea_info(usb, "firmware uploaded\n"); | 668 | uea_info(usb, "firmware uploaded\n"); |
669 | 669 | ||
670 | uea_leaves(usb); | 670 | goto err; |
671 | return; | ||
672 | 671 | ||
673 | err_fw_corrupted: | 672 | err_fw_corrupted: |
674 | uea_err(usb, "firmware is corrupted\n"); | 673 | uea_err(usb, "firmware is corrupted\n"); |
675 | err: | 674 | err: |
675 | release_firmware(fw_entry); | ||
676 | uea_leaves(usb); | 676 | uea_leaves(usb); |
677 | } | 677 | } |
678 | 678 | ||
@@ -705,7 +705,8 @@ static int uea_load_firmware(struct usb_device *usb, unsigned int ver) | |||
705 | break; | 705 | break; |
706 | } | 706 | } |
707 | 707 | ||
708 | ret = request_firmware_nowait(THIS_MODULE, 1, fw_name, &usb->dev, usb, uea_upload_pre_firmware); | 708 | ret = request_firmware_nowait(THIS_MODULE, 1, fw_name, &usb->dev, |
709 | GFP_KERNEL, usb, uea_upload_pre_firmware); | ||
709 | if (ret) | 710 | if (ret) |
710 | uea_err(usb, "firmware %s is not available\n", fw_name); | 711 | uea_err(usb, "firmware %s is not available\n", fw_name); |
711 | else | 712 | else |