Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/ath/ath9k/hw.c

+7 −6
Original line number Diff line number Diff line
@@ -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,12 +854,14 @@ int ath9k_hw_init(struct ath_hw *ah) 
	struct ath_common *common = ath9k_hw_common(ah);

	int r = 0;



	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);

	ath9k_hw_init_config(ah);

drivers/net/wireless/ath/ath9k/hw.h

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ 


#define AR5416_AR9100_DEVID	0x000b



#define AR9271_USB             0x9271



#define	AR_SUBVENDOR_ID_NOG	0x0e11

#define AR_SUBVENDOR_ID_NEW_A	0x7065

#define AR5416_MAGIC		0x19641014