2010-01-07 23:59:57 +02:00
|
|
|
--- a/drivers/net/wireless/ath/carl9170/usb.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/carl9170/usb.c
|
2010-05-26 17:25:17 +03:00
|
|
|
@@ -1000,11 +1000,28 @@ err_failed:
|
2010-01-07 23:59:57 +02:00
|
|
|
ar9170_usb_firmware_failed(aru);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
static int ar9170_usb_request_firmware(struct ar9170_usb *aru)
|
|
|
|
|
{
|
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
|
|
|
|
|
+ const struct firmware *fw;
|
|
|
|
|
+ int ret;
|
|
|
|
|
+
|
|
|
|
|
+ ret = request_firmware(&fw,
|
|
|
|
|
+ ar9170_fws[aru->fw_load].files[aru->fw_files].name,
|
|
|
|
|
+ &aru->udev->dev);
|
|
|
|
|
+
|
|
|
|
|
+ if (ret < 0)
|
|
|
|
|
+ return ret;
|
|
|
|
|
+
|
|
|
|
|
+ ar9170_usb_firmware_step2(fw, aru);
|
|
|
|
|
+ return 0;
|
|
|
|
|
+#else
|
|
|
|
|
return request_firmware_nowait(THIS_MODULE, 1,
|
|
|
|
|
ar9170_fws[aru->fw_load].files[aru->fw_files].name,
|
|
|
|
|
&aru->udev->dev, GFP_KERNEL, aru, ar9170_usb_firmware_step2);
|
|
|
|
|
+#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ar9170_usb_disconnect(struct usb_interface *intf)
|
