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

Commit 66e35474 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Move work cancellation outside of mutex 



There is no need to lock the various work cancellation
calls. This will be helpful when handling FATAL events.

Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ff8f59b5

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1218,6 +1218,11 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw) 
	int ret = 0;

	u8 cmd_rsp;



	/* Cancel all the running timers/work .. */

	cancel_work_sync(&priv->ps_work);

	cancel_delayed_work_sync(&priv->ath9k_led_blink_work);

	ath9k_led_stop_brightness(priv);



	mutex_lock(&priv->mutex);



	if (priv->op_flags & OP_INVALID) {
@@ -1226,11 +1231,6 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw) 
		return;

	}



	/* Cancel all the running timers/work .. */

	cancel_work_sync(&priv->ps_work);

	cancel_delayed_work_sync(&priv->ath9k_led_blink_work);

	ath9k_led_stop_brightness(priv);



	ath9k_htc_ps_wakeup(priv);

	htc_stop(priv->htc);

	WMI_CMD(WMI_DISABLE_INTR_CMDID);