From 721e7b98abbd8207057dadea9a685ab5b8e171b8 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 5 Sep 2010 21:00:26 +0200
Subject: [PATCH] --- yaml --- r: 214618 b: refs/heads/master c:
 950094cb06f3cfd75338d8c197d1d3924724b1a8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fb6f60e416d7..64d457b3589b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4bbf922f39696ed5517ac91a823e4120cb649d0
+refs/heads/master: 950094cb06f3cfd75338d8c197d1d3924724b1a8
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
index 55ac079916d7..c8a2ec802c8c 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -369,7 +369,7 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
 
 	if (!priv->beacon_ctx) {
 		IWL_ERR(priv, "trying to build beacon w/o beacon context!\n");
-		return -EINVAL;
+		return 0;
 	}
 
 	/* Initialize memory */