---

yaml --- r: 314101 b: refs/heads/master c: 4f64a1e h: refs/heads/master i: 314099: 35897b1 v: v3
git-mirror · Jun 5, 2012 · b787ff3 · b787ff3
1 parent a6f8eda
commit b787ff3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b9d2365d51e9726cd288dbeebf20a80d3ac8a38
+refs/heads/master: 4f64a1e93f4749ea2ecacb7e93485ef9607b4e48
diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c
@@ -904,7 +904,8 @@ static void wl1271_fw_wakeup(struct wl1271 *wl)
 static int wl1271_setup(struct wl1271 *wl)
 {
 	wl->fw_status_1 = kmalloc(WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +
-				  sizeof(*wl->fw_status_2), GFP_KERNEL);
+				  sizeof(*wl->fw_status_2) +
+				  wl->fw_status_priv_len, GFP_KERNEL);
 	if (!wl->fw_status_1)
 		return -ENOMEM;