]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Staging: r8187se: Fix for LED not following radio switch
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 11 Feb 2010 20:41:24 +0000 (14:41 -0600)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 00:42:58 +0000 (16:42 -0800)
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>
drivers/staging/rtl8187se/r8180_core.c

index ac987d1492195379f7bade492b6a0f871ccc1ca2..0b7ec6b949b4332447e34d27f69cb0761e4b6c3b 100644 (file)
@@ -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;