Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cb61ea2 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Add a spinlock around SetRFPowerState8190 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bc54f339

drivers/staging/rtl8192e/r8190_rtl8256.c

+9 −4
Original line number Diff line number Diff line
@@ -327,8 +327,11 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState) 
	PRT_POWER_SAVE_CONTROL	pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));

	bool bResult = true;



	if(priv->SetRFPowerStateInProgress == true)

		return false;

	spin_lock(&priv->ps_lock);

	if (priv->SetRFPowerStateInProgress) {

		bResult = false;

		goto out;

	}

	priv->SetRFPowerStateInProgress = true;



	switch( eRFPowerState )
@@ -345,8 +348,8 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState) 
			 */

			if (!NicIFEnableNIC(dev)) {

				RT_TRACE(COMP_ERR, "%s(): NicIFEnableNIC failed\n",__FUNCTION__);

				priv->SetRFPowerStateInProgress = false;

				return false;

				bResult = false;

				goto out;

			}



			RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC);
@@ -424,7 +427,9 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState) 
		priv->ieee80211->eRFPowerState = eRFPowerState;

	}



out:

	priv->SetRFPowerStateInProgress = false;

	spin_unlock(&priv->ps_lock);

	return bResult;

}