diff options
author | David S. Miller <davem@davemloft.net> | 2010-08-16 13:56:01 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-16 13:56:01 -0700 |
commit | 5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc (patch) | |
tree | ed4f35d48b2859d7ced04c9f8e0f4f6b3ac0f603 /drivers/net/wireless/ath/ath9k/hif_usb.c | |
parent | Revert "netlink: netlink_recvmsg() fix" (diff) | |
parent | ath5k: disable ASPM L0s for all cards (diff) | |
download | linux-dev-5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc.tar.xz linux-dev-5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hif_usb.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hif_usb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index 61c1bee3f26a..17e7a9a367e7 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -799,7 +799,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) } kfree(buf); - if (hif_dev->device_id == 0x7010) + if ((hif_dev->device_id == 0x7010) || (hif_dev->device_id == 0x7015)) firm_offset = AR7010_FIRMWARE_TEXT; else firm_offset = AR9271_FIRMWARE_TEXT; @@ -901,6 +901,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface, switch(hif_dev->device_id) { case 0x7010: + case 0x7015: case 0x9018: if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202) hif_dev->fw_name = FIRMWARE_AR7010_1_1; @@ -912,11 +913,6 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface, break; } - if (!hif_dev->fw_name) { - dev_err(&udev->dev, "Can't determine firmware !\n"); - goto err_htc_hw_alloc; - } - ret = ath9k_hif_usb_dev_init(hif_dev); if (ret) { ret = -EINVAL; |