aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-01-04 19:22:02 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-01-21 15:32:21 -0500
commit2a1a78d240c68b918406cb5b31a375eaf1dc1835 (patch)
treeb82c9adfb532608f615106627f05b5aa47d63380 /drivers/net/wireless
parent311dce71b6af263a630717d77bd49cffc0d122a5 (diff)
iwlagn: return error if PAN disable timeout
Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rxon.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 99e96508b1dc..6e80f1070c52 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -74,8 +74,10 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
74 signed long wait_res; 74 signed long wait_res;
75 75
76 wait_res = iwlagn_wait_notification(priv, &disable_wait, HZ); 76 wait_res = iwlagn_wait_notification(priv, &disable_wait, HZ);
77 if (wait_res == 0) 77 if (wait_res == 0) {
78 IWL_ERR(priv, "Timed out waiting for PAN disable\n"); 78 IWL_ERR(priv, "Timed out waiting for PAN disable\n");
79 ret = -EIO;
80 }
79 } 81 }
80 82
81 return ret; 83 return ret;