|
@@ -2512,6 +2512,7 @@ static void musb_free_temp_buffer(struct urb *urb)
|
|
{
|
|
{
|
|
enum dma_data_direction dir;
|
|
enum dma_data_direction dir;
|
|
struct musb_temp_buffer *temp;
|
|
struct musb_temp_buffer *temp;
|
|
|
|
+ size_t length;
|
|
|
|
|
|
if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
|
|
if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
|
|
return;
|
|
return;
|
|
@@ -2522,8 +2523,12 @@ static void musb_free_temp_buffer(struct urb *urb)
|
|
data);
|
|
data);
|
|
|
|
|
|
if (dir == DMA_FROM_DEVICE) {
|
|
if (dir == DMA_FROM_DEVICE) {
|
|
- memcpy(temp->old_xfer_buffer, temp->data,
|
|
|
|
- urb->transfer_buffer_length);
|
|
|
|
|
|
+ if (usb_pipeisoc(urb->pipe))
|
|
|
|
+ length = urb->transfer_buffer_length;
|
|
|
|
+ else
|
|
|
|
+ length = urb->actual_length;
|
|
|
|
+
|
|
|
|
+ memcpy(temp->old_xfer_buffer, temp->data, length);
|
|
}
|
|
}
|
|
urb->transfer_buffer = temp->old_xfer_buffer;
|
|
urb->transfer_buffer = temp->old_xfer_buffer;
|
|
kfree(temp->kmalloc_ptr);
|
|
kfree(temp->kmalloc_ptr);
|