diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-01-07 21:59:57 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-01-07 21:59:57 +0000 |
| commit | 6142c526347c72950a1dcc794dec1da5bd531a2b (patch) | |
| tree | c76455d8ad983182648a1463a39b9d7713168dd9 /package/carl9170/patches/100-request_firmware_compat.patch | |
| parent | fa78fa7e4331c9110e92784e6484ff4c6931cc29 (diff) | |
| download | upstream-6142c526347c72950a1dcc794dec1da5bd531a2b.tar.gz upstream-6142c526347c72950a1dcc794dec1da5bd531a2b.tar.bz2 upstream-6142c526347c72950a1dcc794dec1da5bd531a2b.zip | |
add the carl9170 wifi driver for ar9170 devices
SVN-Revision: 19066
Diffstat (limited to 'package/carl9170/patches/100-request_firmware_compat.patch')
| -rw-r--r-- | package/carl9170/patches/100-request_firmware_compat.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/carl9170/patches/100-request_firmware_compat.patch b/package/carl9170/patches/100-request_firmware_compat.patch new file mode 100644 index 0000000000..93fdc6f084 --- /dev/null +++ b/package/carl9170/patches/100-request_firmware_compat.patch @@ -0,0 +1,31 @@ +--- a/drivers/net/wireless/ath/carl9170/usb.c ++++ b/drivers/net/wireless/ath/carl9170/usb.c +@@ -983,11 +983,28 @@ err_failed: + 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) |