From b3e8f623284e3756ce6ce3774f9f89c241f0f081 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 15 May 2010 23:12:28 +0200 Subject: [PATCH] --- yaml --- r: 202743 b: refs/heads/master c: 731a9b2a024714a3fa070b014744d02b9a96b3b6 h: refs/heads/master i: 202741: 5b982df3b9a7c1f209e3c30b130c53cd3c4dca97 202739: 1bf601778b5efb04a6cbd1d152530b3e91853cfc 202735: 83c83b5fb54e0abadc131287ddea2d43420aadc7 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/if_usb.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c75be1d08be..5dd87ebf7709 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04236066e00ab20c6745569268d67a980bd06abd +refs/heads/master: 731a9b2a024714a3fa070b014744d02b9a96b3b6 diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c index a0cb265e5816..3678e532874f 100644 --- a/trunk/drivers/net/wireless/libertas/if_usb.c +++ b/trunk/drivers/net/wireless/libertas/if_usb.c @@ -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",