aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se/r8180_core.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2010-02-11 14:41:24 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:58 -0800
commit6de92dd6495e36c0c2cddbee3e7c6a49f608e7cf (patch)
tree6fe81c0da3393b4808bfc56d3e334e2eb4a3ac9b /drivers/staging/rtl8187se/r8180_core.c
parent742821ce5fdf691826154fe72ba0884f71a40982 (diff)
Staging: r8187se: Fix for LED not following radio switch
The current driver does not follow the state of the RF switch. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_core.c')
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index ac987d14921..0b7ec6b949b 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -4238,11 +4238,12 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work)
/* HW radio On/Off according to the value of FF51[4](config0) */
btConfig0 = btPSR = read_nic_byte(dev, CONFIG0);
- /* Turn on LED. */
- write_nic_byte(dev, PSR, btPSR | BIT3);
-
eRfPowerStateToSet = (btConfig0 & BIT4) ? eRfOn : eRfOff;
+ /* Turn LED back on when radio enabled */
+ if (eRfPowerStateToSet == eRfOn)
+ write_nic_byte(dev, PSR, btPSR | BIT3);
+
if ((priv->ieee80211->bHwRadioOff == true) &&
(eRfPowerStateToSet == eRfOn)) {
priv->ieee80211->bHwRadioOff = false;