Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / net / wireless / rtl818x / rtl8187_rfkill.c

diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c b/drivers/net/wireless/rtl818x/rtl8187_rfkill.c
index cad8037ab2af3a4d136194dcdf3e322d65495ad6..03555e1e0cab29cb0d8b4698b71d994d3ec11296 100644 (file)
--- 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)
        u8 gpio;
 
        gpio = rtl818x_ioread8(priv, &priv->map->GPIO0);
-       rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~0x02);
+       rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~priv->rfkill_mask);
        gpio = rtl818x_ioread8(priv, &priv->map->GPIO1);
 
-       return gpio & 0x02;
+       return gpio & priv->rfkill_mask;
 }
 
 void rtl8187_rfkill_init(struct ieee80211_hw *hw)