Merge staging-next tree into Linus's latest version

[mv-sheeva.git] / drivers / staging / usbip / stub_rx.c

diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c
index da30658fa04898ede2c952fbaadc07202388f8fb..5972ae70e3813d2ae72f2da2f9dae8b67e406fce 100644 (file)
--- a/drivers/staging/usbip/stub_rx.c
+++ b/drivers/staging/usbip/stub_rx.c
@@ -502,13 +502,13 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
        }
 
        /* set priv->urb->setup_packet */
-       priv->urb->setup_packet = kzalloc(8, GFP_KERNEL);
+       priv->urb->setup_packet = kmemdup(&pdu->u.cmd_submit.setup, 8,
+                                         GFP_KERNEL);
        if (!priv->urb->setup_packet) {
                dev_err(&sdev->interface->dev, "allocate setup_packet\n");
                usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC);
                return;
        }
-       memcpy(priv->urb->setup_packet, &pdu->u.cmd_submit.setup, 8);
 
        /* set other members from the base header of pdu */
        priv->urb->context                = (void *) priv;