From 9b3c4a098d74f5204436db5866286e64fd2b7b6a Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 26 Sep 2012 10:21:48 +0300 Subject: [PATCH] --- yaml --- r: 328381 b: refs/heads/master c: 58901d181f12807d6bfa7ef29547b560740dd305 h: refs/heads/master i: 328379: cca4538039905d7ad9a1b3ba349f5483bc975d50 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aed49c0fe7ee..b7349a72f957 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 365d2ebcaba5f08590b8a988d137f7139a8163a5 +refs/heads/master: 58901d181f12807d6bfa7ef29547b560740dd305 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index e40cfe846a48..24e8f8d708ad 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -3297,8 +3297,8 @@ brcmf_notify_sched_scan_results(struct brcmf_cfg80211_priv *cfg_priv, int i; request = kzalloc(sizeof(*request), GFP_KERNEL); - ssid = kzalloc(sizeof(*ssid) * result_count, GFP_KERNEL); - channel = kzalloc(sizeof(*channel) * result_count, GFP_KERNEL); + ssid = kcalloc(result_count, sizeof(*ssid), GFP_KERNEL); + channel = kcalloc(result_count, sizeof(*channel), GFP_KERNEL); if (!request || !ssid || !channel) { err = -ENOMEM; goto out_err;