Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202743
b: refs/heads/master
c: 731a9b2
h: refs/heads/master
i:
  202741: 5b982df
  202739: 1bf6017
  202735: 83c83b5
v: v3
  • Loading branch information
Julia Lawall authored and John W. Linville committed Jun 2, 2010
1 parent cacc9bb commit b3e8f62
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 04236066e00ab20c6745569268d67a980bd06abd
refs/heads/master: 731a9b2a024714a3fa070b014744d02b9a96b3b6
6 changes: 2 additions & 4 deletions trunk/drivers/net/wireless/libertas/if_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,16 +613,14 @@ static void if_usb_receive_fwload(struct urb *urb)
return;
}

syncfwheader = kmalloc(sizeof(struct fwsyncheader), GFP_ATOMIC);
syncfwheader = kmemdup(skb->data + IPFIELD_ALIGN_OFFSET,
sizeof(struct fwsyncheader), GFP_ATOMIC);
if (!syncfwheader) {
lbs_deb_usbd(&cardp->udev->dev, "Failure to allocate syncfwheader\n");
kfree_skb(skb);
return;
}

memcpy(syncfwheader, skb->data + IPFIELD_ALIGN_OFFSET,
sizeof(struct fwsyncheader));

if (!syncfwheader->cmd) {
lbs_deb_usb2(&cardp->udev->dev, "FW received Blk with correct CRC\n");
lbs_deb_usb2(&cardp->udev->dev, "FW received Blk seqnum = %d\n",
Expand Down

0 comments on commit b3e8f62

Please sign in to comment.