hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: usbdux: request firmware synchronously 

Change the request_firmware_nowait() to a request_firmware() so
that the usb_driver (*probe) can continue with the comedi_driver
(*auto_attach).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-05-20 14:29:06 -07:00 committed by Greg Kroah-Hartman
parent f9eb8a3b14
commit 71f89d1813
1 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/staging/comedi/drivers/usbdux.c
View File

@ -2364,40 +2364,12 @@ static struct comedi_driver usbdux_driver = {
.detach = usbdux_detach,
};
static void usbdux_firmware_request_complete_handler(const struct firmware *fw,
void *context)
{
struct usbduxsub *usbduxsub_tmp = context;
struct usb_interface *uinterf = usbduxsub_tmp->interface;
int ret;
if (fw == NULL) {
dev_err(&uinterf->dev,
"Firmware complete handler without firmware!\n");
return;
}
/*
* we need to upload the firmware here because fw will be
* freed once we've left this function
*/
ret = firmware_upload(usbduxsub_tmp, fw->data, fw->size);
if (ret) {
dev_err(&uinterf->dev,
"Could not upload firmware (err=%d)\n", ret);
goto out;
}
comedi_usb_auto_config(uinterf, &usbdux_driver, 0);
out:
release_firmware(fw);
}
static int usbdux_usb_probe(struct usb_interface *uinterf,
const struct usb_device_id *id)
{
struct usb_device *udev = interface_to_usbdev(uinterf);
struct device *dev = &uinterf->dev;
const struct firmware *fw;
int i;
int index;
int ret;
@ -2617,23 +2589,15 @@ static int usbdux_usb_probe(struct usb_interface *uinterf,
usbduxsub[index].probed = 1;
up(&start_stop_sem);
ret = request_firmware_nowait(THIS_MODULE,
FW_ACTION_HOTPLUG,
FIRMWARE,
&udev->dev,
GFP_KERNEL,
usbduxsub + index,
usbdux_firmware_request_complete_handler);
if (ret) {
dev_err(dev, "Could not load firmware (err=%d)\n", ret);
return ret;
ret = request_firmware(&fw, FIRMWARE, &udev->dev);
if (ret == 0) {
ret = firmware_upload(&usbduxsub[index], fw->data, fw->size);
release_firmware(fw);
}
if (ret < 0)
return ret;
dev_info(dev, "comedi_: usbdux%d "
"has been successfully initialised.\n", index);
/* success */
return 0;
return comedi_usb_auto_config(uinterf, &usbdux_driver, 0);
}
static void usbdux_usb_disconnect(struct usb_interface *intf)