diff --git a/[refs] b/[refs] index 2fd85a71348e..7c0e6a788953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 140e28b83c4a31831cbf293d9cab20c603821202 +refs/heads/master: cff863871e748d072cae002fb13e692436b0200a diff --git a/trunk/drivers/staging/line6/midi.c b/trunk/drivers/staging/line6/midi.c index ed5577f25afe..7f1e90e14411 100644 --- a/trunk/drivers/staging/line6/midi.c +++ b/trunk/drivers/staging/line6/midi.c @@ -135,7 +135,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data, line6_write_hexdump(line6, 'S', data, length); #endif - transfer_buffer = kmalloc(length, GFP_ATOMIC); + transfer_buffer = kmemdup(data, length, GFP_ATOMIC); if (transfer_buffer == NULL) { usb_free_urb(urb); @@ -143,7 +143,6 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data, return -ENOMEM; } - memcpy(transfer_buffer, data, length); usb_fill_int_urb(urb, line6->usbdev, usb_sndbulkpipe(line6->usbdev, line6->ep_control_write),