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

Commit d54bc4e3 authored by Zhu, Yi's avatar Zhu, Yi Committed by John W. Linville
Browse files

iwl3945: fix deadlock on suspend 



This patch fixes iwl3945 deadlock during suspend by moving notify_mac out
of iwl3945 mutex. This is a portion of the same fix for iwlwifi by Tomas.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 14b54336

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −1
Original line number Diff line number Diff line
@@ -5768,7 +5768,6 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv) 
	if (priv->error_recovering)

		iwl3945_error_recovery(priv);



	ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);

	return;



 restart:
@@ -6013,6 +6012,7 @@ static void iwl3945_bg_alive_start(struct work_struct *data) 
	mutex_lock(&priv->mutex);

	iwl3945_alive_start(priv);

	mutex_unlock(&priv->mutex);

	ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);

}



static void iwl3945_bg_rf_kill(struct work_struct *work)