diff options
author | David S. Miller <davem@davemloft.net> | 2011-11-28 19:21:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-28 19:21:10 -0500 |
commit | 8317e2047ef7d70dd76bf1d571fecaa8d4deb06f (patch) | |
tree | c400a600a4eb00da224b4e59e76396655e853d07 /drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | |
parent | tg3: Scale back code that modifies MRRS (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem (diff) | |
download | linux-dev-8317e2047ef7d70dd76bf1d571fecaa8d4deb06f.tar.xz linux-dev-8317e2047ef7d70dd76bf1d571fecaa8d4deb06f.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 8457e969eb4f..ba3e4b5cba71 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -1550,11 +1550,10 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx) if (le32_to_cpu(hdr->idx) == idx) { pdata = wl->fw.fw_bin[i]->data + le32_to_cpu(hdr->offset); - *pbuf = kmalloc(len, GFP_ATOMIC); + *pbuf = kmemdup(pdata, len, GFP_ATOMIC); if (*pbuf == NULL) goto fail; - memcpy(*pbuf, pdata, len); return 0; } } |