Return-path: Received: from mga01.intel.com ([192.55.52.88]:39826 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753998AbYKDUVR (ORCPT ); Tue, 4 Nov 2008 15:21:17 -0500 From: Reinette Chatre To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, ipw3945-devel@lists.sourceforge.net, "Zhu, Yi" , Tomas Winkler , Reinette Chatre Subject: [PATCH 3/3] iwl3945: fix deadlock on suspend Date: Tue, 4 Nov 2008 12:21:36 -0800 Message-Id: <1225830096-7052-4-git-send-email-reinette.chatre@intel.com> (sfid-20081104_212125_132184_EB082B39) In-Reply-To: <1225830096-7052-3-git-send-email-reinette.chatre@intel.com> References: <> <1225830096-7052-1-git-send-email-reinette.chatre@intel.com> <1225830096-7052-2-git-send-email-reinette.chatre@intel.com> <1225830096-7052-3-git-send-email-reinette.chatre@intel.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Zhu, Yi 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: Zhu Yi Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre --- Also applies to 2.6.28. drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index caac74c..5dd53a1 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -5714,7 +5714,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: @@ -5959,6 +5958,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) -- 1.5.4.3