diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 13 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index e716b600dec5..feae55a8124d 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -547,7 +547,6 @@ static bool ath9k_hw_devid_supported(u16 devid) | |||
547 | case AR9285_DEVID_PCIE: | 547 | case AR9285_DEVID_PCIE: |
548 | case AR5416_DEVID_AR9287_PCI: | 548 | case AR5416_DEVID_AR9287_PCI: |
549 | case AR5416_DEVID_AR9287_PCIE: | 549 | case AR5416_DEVID_AR9287_PCIE: |
550 | case AR9271_USB: | ||
551 | case AR2427_DEVID_PCIE: | 550 | case AR2427_DEVID_PCIE: |
552 | return true; | 551 | return true; |
553 | default: | 552 | default: |
@@ -855,11 +854,13 @@ int ath9k_hw_init(struct ath_hw *ah) | |||
855 | struct ath_common *common = ath9k_hw_common(ah); | 854 | struct ath_common *common = ath9k_hw_common(ah); |
856 | int r = 0; | 855 | int r = 0; |
857 | 856 | ||
858 | if (!ath9k_hw_devid_supported(ah->hw_version.devid)) { | 857 | if (common->bus_ops->ath_bus_type != ATH_USB) { |
859 | ath_print(common, ATH_DBG_FATAL, | 858 | if (!ath9k_hw_devid_supported(ah->hw_version.devid)) { |
860 | "Unsupported device ID: 0x%0x\n", | 859 | ath_print(common, ATH_DBG_FATAL, |
861 | ah->hw_version.devid); | 860 | "Unsupported device ID: 0x%0x\n", |
862 | return -EOPNOTSUPP; | 861 | ah->hw_version.devid); |
862 | return -EOPNOTSUPP; | ||
863 | } | ||
863 | } | 864 | } |
864 | 865 | ||
865 | ath9k_hw_init_defaults(ah); | 866 | ath9k_hw_init_defaults(ah); |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 97ebeba8a157..b02a97c72c64 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -44,8 +44,6 @@ | |||
44 | 44 | ||
45 | #define AR5416_AR9100_DEVID 0x000b | 45 | #define AR5416_AR9100_DEVID 0x000b |
46 | 46 | ||
47 | #define AR9271_USB 0x9271 | ||
48 | |||
49 | #define AR_SUBVENDOR_ID_NOG 0x0e11 | 47 | #define AR_SUBVENDOR_ID_NOG 0x0e11 |
50 | #define AR_SUBVENDOR_ID_NEW_A 0x7065 | 48 | #define AR_SUBVENDOR_ID_NEW_A 0x7065 |
51 | #define AR5416_MAGIC 0x19641014 | 49 | #define AR5416_MAGIC 0x19641014 |