From f2493167121c15552106e1d731cfcac3233ccba7 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 11 Feb 2010 14:41:24 -0600
Subject: [PATCH] --- yaml --- r: 186767 b: refs/heads/master c:
 6de92dd6495e36c0c2cddbee3e7c6a49f608e7cf h: refs/heads/master i:   186765:
 da98d46779ea7e183133c5aa3d53b02ece4fe064   186763:
 2946cbd7f4b30b10ea8d8c6861a1fd8b910c06bc   186759:
 c27841a51fcc8255bb9c021cdbedbe9d62b18981   186751:
 1f8d03b6fa2bf79f900ecd643b87d1e9ae3c8ddd v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/rtl8187se/r8180_core.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c897b9074361..5ff8f097a4ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 742821ce5fdf691826154fe72ba0884f71a40982
+refs/heads/master: 6de92dd6495e36c0c2cddbee3e7c6a49f608e7cf
diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c
index ac987d149219..0b7ec6b949b4 100644
--- a/trunk/drivers/staging/rtl8187se/r8180_core.c
+++ b/trunk/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;