From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 5 Jan 2011 00:22:02 +0000 (-0800)
Subject: iwlagn: return error if PAN disable timeout
X-Git-Tag: android-x86-4.4-r1~6885^2~448^2~33
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2a1a78d240c68b918406cb5b31a375eaf1dc1835;p=android-x86%2Fkernel.git

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>
---

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,
 		signed long wait_res;
 
 		wait_res = iwlagn_wait_notification(priv, &disable_wait, HZ);
-		if (wait_res == 0)
+		if (wait_res == 0) {
 			IWL_ERR(priv, "Timed out waiting for PAN disable\n");
+			ret = -EIO;
+		}
 	}
 
 	return ret;