提交 b97c3c1a 编写于 作者: J Johan Hovold 提交者: Greg Kroah-Hartman

staging: octeon-usb: fix unaligned isochronous transfers

Make sure to copy the whole transfer buffer when releasing the temporary
buffer used for unaligned isochronous transfers as the data is not
necessarily contiguous in that case.
Signed-off-by: NJohan Hovold <johan@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 b787f68c
...@@ -499,15 +499,21 @@ static int octeon_alloc_temp_buffer(struct urb *urb, gfp_t mem_flags) ...@@ -499,15 +499,21 @@ static int octeon_alloc_temp_buffer(struct urb *urb, gfp_t mem_flags)
static void octeon_free_temp_buffer(struct urb *urb) static void octeon_free_temp_buffer(struct urb *urb)
{ {
struct octeon_temp_buffer *temp; struct octeon_temp_buffer *temp;
size_t length;
if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER)) if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
return; return;
temp = container_of(urb->transfer_buffer, struct octeon_temp_buffer, temp = container_of(urb->transfer_buffer, struct octeon_temp_buffer,
data); data);
if (usb_urb_dir_in(urb)) if (usb_urb_dir_in(urb)) {
memcpy(temp->orig_buffer, urb->transfer_buffer, if (usb_pipeisoc(urb->pipe))
urb->actual_length); length = urb->transfer_buffer_length;
else
length = urb->actual_length;
memcpy(temp->orig_buffer, urb->transfer_buffer, length);
}
urb->transfer_buffer = temp->orig_buffer; urb->transfer_buffer = temp->orig_buffer;
urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER; urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;
kfree(temp); kfree(temp);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册