From 9266257a3ce295a18d23e97ca5c104138b52ad95 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 4 Jan 2011 16:22:02 -0800
Subject: [PATCH] --- yaml --- r: 236748 b: refs/heads/master c:
 2a1a78d240c68b918406cb5b31a375eaf1dc1835 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5824478bfc45..9753a68d7f73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 311dce71b6af263a630717d77bd49cffc0d122a5
+refs/heads/master: 2a1a78d240c68b918406cb5b31a375eaf1dc1835
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 99e96508b1dc..6e80f1070c52 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/trunk/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;