summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/hw.c
diff options
context:
space:
mode:
authorSujith2010-04-01 06:58:23 +0200
committerJohn W. Linville2010-04-06 22:55:10 +0200
commitffa49f8209ef77ebf2cce0bbc129ca40064b8fb6 (patch)
tree0bf6606630e385912e79c4517874364698c1fd10 /drivers/net/wireless/ath/ath9k/hw.c
parentath: Add a bus type field (diff)
downloadkernel-qcow2-linux-ffa49f8209ef77ebf2cce0bbc129ca40064b8fb6.tar.gz
kernel-qcow2-linux-ffa49f8209ef77ebf2cce0bbc129ca40064b8fb6.tar.xz
kernel-qcow2-linux-ffa49f8209ef77ebf2cce0bbc129ca40064b8fb6.zip
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: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c13
1 files changed, 7 insertions, 6 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)
case AR9285_DEVID_PCIE:
case AR5416_DEVID_AR9287_PCI:
case AR5416_DEVID_AR9287_PCIE:
- case AR9271_USB:
case AR2427_DEVID_PCIE:
return true;
default:
@@ -855,11 +854,13 @@ int ath9k_hw_init(struct ath_hw *ah)
struct ath_common *common = ath9k_hw_common(ah);
int r = 0;
- if (!ath9k_hw_devid_supported(ah->hw_version.devid)) {
- ath_print(common, ATH_DBG_FATAL,
- "Unsupported device ID: 0x%0x\n",
- ah->hw_version.devid);
- return -EOPNOTSUPP;
+ if (common->bus_ops->ath_bus_type != ATH_USB) {
+ if (!ath9k_hw_devid_supported(ah->hw_version.devid)) {
+ ath_print(common, ATH_DBG_FATAL,
+ "Unsupported device ID: 0x%0x\n",
+ ah->hw_version.devid);
+ return -EOPNOTSUPP;
+ }
}
ath9k_hw_init_defaults(ah);