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

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

ath9k: Change return value of ath9k_hw_fill_cap_info 



This routine always return true, checking for false
in the return value is invalid. Fix this.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d8baa939

drivers/net/wireless/ath9k/hw.c

+2 −8
Original line number Diff line number Diff line
@@ -837,11 +837,7 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc, 
	if (AR_SREV_9280_20(ah))

		ath9k_hw_init_txgain_ini(ah);



	if (!ath9k_hw_fill_cap_info(ah)) {

		DPRINTF(sc, ATH_DBG_RESET, "failed ath9k_hw_fill_cap_info\n");

		ecode = -EINVAL;

		goto bad;

	}

	ath9k_hw_fill_cap_info(ah);



	if ((ah->hw_version.devid == AR9280_DEVID_PCI) &&

	    test_bit(ATH9K_MODE_11A, ah->caps.wireless_modes)) {
@@ -3228,7 +3224,7 @@ void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah, 
/* HW Capabilities */

/*******************/



bool ath9k_hw_fill_cap_info(struct ath_hw *ah)

void ath9k_hw_fill_cap_info(struct ath_hw *ah)

{

	struct ath9k_hw_capabilities *pCap = &ah->caps;

	u16 capField = 0, eeval;
@@ -3403,8 +3399,6 @@ bool ath9k_hw_fill_cap_info(struct ath_hw *ah) 
		ah->btactive_gpio = 6;

		ah->wlanactive_gpio = 5;

	}



	return true;

}



bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,

drivers/net/wireless/ath9k/hw.h

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ struct ath_hw *ath9k_hw_attach(u16 devid, struct ath_softc *sc, int *error); 
void ath9k_hw_rfdetach(struct ath_hw *ah);

int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,

		   bool bChannelChange);

bool ath9k_hw_fill_cap_info(struct ath_hw *ah);

void ath9k_hw_fill_cap_info(struct ath_hw *ah);

bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,

			    u32 capability, u32 *result);

bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type,