Commit ffa49f82 authored by Sujith's avatar Sujith Committed by John W. Linville

ath9k_hw: Don't check devid for ath9k_htc

For USB devices, this check is invalid.
Remove the check so that new product IDs can be added.
Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 497ad9ad
...@@ -547,7 +547,6 @@ static bool ath9k_hw_devid_supported(u16 devid) ...@@ -547,7 +547,6 @@ static bool ath9k_hw_devid_supported(u16 devid)
case AR9285_DEVID_PCIE: case AR9285_DEVID_PCIE:
case AR5416_DEVID_AR9287_PCI: case AR5416_DEVID_AR9287_PCI:
case AR5416_DEVID_AR9287_PCIE: case AR5416_DEVID_AR9287_PCIE:
case AR9271_USB:
case AR2427_DEVID_PCIE: case AR2427_DEVID_PCIE:
return true; return true;
default: default:
...@@ -855,12 +854,14 @@ int ath9k_hw_init(struct ath_hw *ah) ...@@ -855,12 +854,14 @@ int ath9k_hw_init(struct ath_hw *ah)
struct ath_common *common = ath9k_hw_common(ah); struct ath_common *common = ath9k_hw_common(ah);
int r = 0; int r = 0;
if (common->bus_ops->ath_bus_type != ATH_USB) {
if (!ath9k_hw_devid_supported(ah->hw_version.devid)) { if (!ath9k_hw_devid_supported(ah->hw_version.devid)) {
ath_print(common, ATH_DBG_FATAL, ath_print(common, ATH_DBG_FATAL,
"Unsupported device ID: 0x%0x\n", "Unsupported device ID: 0x%0x\n",
ah->hw_version.devid); ah->hw_version.devid);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
}
ath9k_hw_init_defaults(ah); ath9k_hw_init_defaults(ah);
ath9k_hw_init_config(ah); ath9k_hw_init_config(ah);
......
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
#define AR5416_AR9100_DEVID 0x000b #define AR5416_AR9100_DEVID 0x000b
#define AR9271_USB 0x9271
#define AR_SUBVENDOR_ID_NOG 0x0e11 #define AR_SUBVENDOR_ID_NOG 0x0e11
#define AR_SUBVENDOR_ID_NEW_A 0x7065 #define AR_SUBVENDOR_ID_NEW_A 0x7065
#define AR5416_MAGIC 0x19641014 #define AR5416_MAGIC 0x19641014
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment