From 9b3e83a48e4a683d58cb7abc6edc1f25c41ace37 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 6 Nov 2011 22:58:31 +0100 Subject: [PATCH] --- yaml --- r: 275675 b: refs/heads/master c: db652e4b36e5f1e5f49a4a49caf3aa365fe851c4 h: refs/heads/master i: 275673: 9fbc1a5aa5adb12207d23966827e338f057edb01 275671: cf17d952fc4e158b8061e464cb2cdc7ca713bc75 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/scan.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 931d17a1fe75..31dbceef797b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b6ef6334febb05d3050a96546e635f038dbcb15 +refs/heads/master: db652e4b36e5f1e5f49a4a49caf3aa365fe851c4 diff --git a/trunk/drivers/net/wireless/mwifiex/scan.c b/trunk/drivers/net/wireless/mwifiex/scan.c index dae8dbb24a03..8a3f9598ad33 100644 --- a/trunk/drivers/net/wireless/mwifiex/scan.c +++ b/trunk/drivers/net/wireless/mwifiex/scan.c @@ -1469,7 +1469,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid, s32 rssi, const u8 *ie_buf, size_t ie_len, u16 beacon_period, u16 cap_info_bitmap, u8 band) { - struct mwifiex_bssdescriptor *bss_desc = NULL; + struct mwifiex_bssdescriptor *bss_desc; int ret; unsigned long flags; u8 *beacon_ie; @@ -1484,6 +1484,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid, beacon_ie = kmemdup(ie_buf, ie_len, GFP_KERNEL); if (!beacon_ie) { + kfree(bss_desc); dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n"); return -ENOMEM; }