diff options
| author | Rajkumar Manoharan <rmanoharan@atheros.com> | 2010-08-13 18:36:40 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-13 13:46:20 -0400 |
| commit | ca6cff1f80f30cc6313a943339361ad6f9e76548 (patch) | |
| tree | fdbc896961b96bab7dba33232d4c0dc361e145a2 /drivers/net/wireless/ath/ath9k/hif_usb.c | |
| parent | fe0dbcc9d2e941328b3269dab102b94ad697ade5 (diff) | |
| download | kernel_samsung_smdk4412-ca6cff1f80f30cc6313a943339361ad6f9e76548.zip kernel_samsung_smdk4412-ca6cff1f80f30cc6313a943339361ad6f9e76548.tar.gz kernel_samsung_smdk4412-ca6cff1f80f30cc6313a943339361ad6f9e76548.tar.bz2 | |
ath9k_htc: load proper firmware for device ID 7015
This patch handles the firmware loading properly
for device ID 7015.
Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
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 61c1bee..17e7a9a 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; |