From f9ab042fd02405c0af646feb1ab3085a338cf7b7 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Sun, 14 Aug 2011 13:17:24 +0300
Subject: [PATCH] --- yaml --- r: 265806 b: refs/heads/master c:
 b42f068baab96a899bb5488ad9f0e72b14743ec5 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/wl12xx/cmd.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a0752c7744a2..71c9a4fe1b68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b67476ef1a6417b92d3bb52510ceee266cd9ea1e
+refs/heads/master: b42f068baab96a899bb5488ad9f0e72b14743ec5
diff --git a/trunk/drivers/net/wireless/wl12xx/cmd.c b/trunk/drivers/net/wireless/wl12xx/cmd.c
index d655e629677c..261807b45ab5 100644
--- a/trunk/drivers/net/wireless/wl12xx/cmd.c
+++ b/trunk/drivers/net/wireless/wl12xx/cmd.c
@@ -1203,6 +1203,10 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
 	struct wl1271_cmd_set_keys *cmd;
 	int ret = 0;
 
+	/* hlid might have already been deleted */
+	if (wl->sta_hlid == WL12XX_INVALID_LINK_ID)
+		return 0;
+
 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
 	if (!cmd) {
 		ret = -ENOMEM;