---

yaml --- r: 265806 b: refs/heads/master c: b42f068 h: refs/heads/master v: v3
git-mirror · Aug 22, 2011 · f9ab042 · f9ab042
1 parent c9954c5
commit f9ab042
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;