Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278228
b: refs/heads/master
c: 1f1d528
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Meyer authored and John W. Linville committed Nov 21, 2011
1 parent 07c262d commit 449b282
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0dcc3c842930a36d344d240878ee24910c838665
refs/heads/master: 1f1d528977162a1a04aaecdc7f08a5b715a58810
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -1549,11 +1549,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;
}
}
Expand Down

0 comments on commit 449b282

Please sign in to comment.