diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/rtl818x/rtl8187_rfkill.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/rtl818x/rtl8187_rfkill.c')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187_rfkill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c b/drivers/net/wireless/rtl818x/rtl8187_rfkill.c index cad8037ab2af..03555e1e0cab 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c +++ b/drivers/net/wireless/rtl818x/rtl8187_rfkill.c | |||
| @@ -25,10 +25,10 @@ static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv) | |||
| 25 | u8 gpio; | 25 | u8 gpio; |
| 26 | 26 | ||
| 27 | gpio = rtl818x_ioread8(priv, &priv->map->GPIO0); | 27 | gpio = rtl818x_ioread8(priv, &priv->map->GPIO0); |
| 28 | rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~0x02); | 28 | rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~priv->rfkill_mask); |
| 29 | gpio = rtl818x_ioread8(priv, &priv->map->GPIO1); | 29 | gpio = rtl818x_ioread8(priv, &priv->map->GPIO1); |
| 30 | 30 | ||
| 31 | return gpio & 0x02; | 31 | return gpio & priv->rfkill_mask; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | void rtl8187_rfkill_init(struct ieee80211_hw *hw) | 34 | void rtl8187_rfkill_init(struct ieee80211_hw *hw) |