- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / comedi / drivers / usbduxfast.c

diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index d143222..2e675cc 100644 (file)
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -1451,10 +1451,12 @@ static void usbduxfast_firmware_request_complete_handler(const struct firmware
        if (ret) {
                dev_err(&usbdev->dev,
                        "Could not upload firmware (err=%d)\n", ret);
-               return;
+               goto out;
        }
 
        comedi_usb_auto_config(usbdev, BOARDNAME);
+ out:
+       release_firmware(fw);
 }
 
 /*
@@ -1569,6 +1571,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
                                      FW_ACTION_HOTPLUG,
                                      "usbduxfast_firmware.bin",
                                      &udev->dev,
+                                     GFP_KERNEL,
                                      usbduxfastsub + index,
                                      usbduxfast_firmware_request_complete_handler);