1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index f41594c7ac16..3678e532874f 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/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",
@@ -1043,6 +1041,12 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
         if (priv->psstate != PS_STATE_FULL_POWER)
                 return -1;
 
+        if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
+                lbs_pr_info("Suspend attempt without "
+                                                "configuring wake params!\n");
+                return -ENOSYS;
+        }
+
         ret = lbs_suspend(priv);
         if (ret)
                 goto out;