diff options
| author | Mike McCormack <mikem@ring3k.org> | 2011-02-11 08:45:03 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 12:35:34 -0800 |
| commit | 48f0210695ebe021b6477047794b1f004819855c (patch) | |
| tree | bf4f4c837139d131ec45ff84dc4003a3c17e1d98 /drivers/staging/rtl8192e/r8190_rtl8256.c | |
| parent | 18c53dfe0311b6db7845a53a02985d363de77f86 (diff) | |
| download | op-kernel-dev-48f0210695ebe021b6477047794b1f004819855c.zip op-kernel-dev-48f0210695ebe021b6477047794b1f004819855c.tar.gz | |
staging: rtl8192e: rf_ps_lock doesn't need to be IRQ safe
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/r8190_rtl8256.c')
| -rw-r--r-- | drivers/staging/rtl8192e/r8190_rtl8256.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c index db70505..7896d23 100644 --- a/drivers/staging/rtl8192e/r8190_rtl8256.c +++ b/drivers/staging/rtl8192e/r8190_rtl8256.c @@ -716,7 +716,6 @@ MgntActSet_RF_State( bool bConnectBySSID = false; RT_RF_POWER_STATE rtState; u16 RFWaitCounter = 0; - unsigned long flag; RT_TRACE(COMP_POWER, "===>MgntActSet_RF_State(): StateToSet(%d)\n",StateToSet); //1// @@ -726,10 +725,10 @@ MgntActSet_RF_State( while(true) { - spin_lock_irqsave(&priv->rf_ps_lock,flag); + spin_lock(&priv->rf_ps_lock); if(priv->RFChangeInProgress) { - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); + spin_unlock(&priv->rf_ps_lock); RT_TRACE(COMP_POWER, "MgntActSet_RF_State(): RF Change in progress! Wait to set..StateToSet(%d).\n", StateToSet); // Set RF after the previous action is done. @@ -751,7 +750,7 @@ MgntActSet_RF_State( else { priv->RFChangeInProgress = true; - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); + spin_unlock(&priv->rf_ps_lock); break; } } @@ -809,9 +808,9 @@ MgntActSet_RF_State( } // Release RF spinlock - spin_lock_irqsave(&priv->rf_ps_lock,flag); + spin_lock(&priv->rf_ps_lock); priv->RFChangeInProgress = false; - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); + spin_unlock(&priv->rf_ps_lock); RT_TRACE(COMP_POWER, "<===MgntActSet_RF_State()\n"); return bActionAllowed; |
