Commit 90826313 authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville

ath9k/ath9k_htc: Fix PS wrappers for RF kill

ath9k_hw_gpio_get reads the GPIO in/out registers to get the status of
GPIO pins, so use PS wrappers
Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3b9ce80c
...@@ -84,9 +84,14 @@ void ath_init_leds(struct ath_softc *sc) ...@@ -84,9 +84,14 @@ void ath_init_leds(struct ath_softc *sc)
static bool ath_is_rfkill_set(struct ath_softc *sc) static bool ath_is_rfkill_set(struct ath_softc *sc)
{ {
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
bool is_blocked;
return ath9k_hw_gpio_get(ah, ah->rfkill_gpio) == ath9k_ps_wakeup(sc);
is_blocked = ath9k_hw_gpio_get(ah, ah->rfkill_gpio) ==
ah->rfkill_polarity; ah->rfkill_polarity;
ath9k_ps_restore(sc);
return is_blocked;
} }
void ath9k_rfkill_poll_state(struct ieee80211_hw *hw) void ath9k_rfkill_poll_state(struct ieee80211_hw *hw)
......
...@@ -228,8 +228,14 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv) ...@@ -228,8 +228,14 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv)
static bool ath_is_rfkill_set(struct ath9k_htc_priv *priv) static bool ath_is_rfkill_set(struct ath9k_htc_priv *priv)
{ {
return ath9k_hw_gpio_get(priv->ah, priv->ah->rfkill_gpio) == bool is_blocked;
priv->ah->rfkill_polarity;
ath9k_htc_ps_wakeup(priv);
is_blocked = ath9k_hw_gpio_get(priv->ah, priv->ah->rfkill_gpio) ==
priv->ah->rfkill_polarity;
ath9k_htc_ps_restore(priv);
return is_blocked;
} }
void ath9k_htc_rfkill_poll_state(struct ieee80211_hw *hw) void ath9k_htc_rfkill_poll_state(struct ieee80211_hw *hw)
......
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