From: Mathias Nyman Date: Thu, 17 Jun 2021 15:03:53 +0000 (+0300) Subject: xhci: handle failed buffer copy to URB sg list and fix a W=1 copiler warning X-Git-Tag: accepted/tizen/unified/20230118.172025~6887^2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=271a21d8b280b186f8cc9ca6f7151902efde9512;p=platform%2Fkernel%2Flinux-rpi.git xhci: handle failed buffer copy to URB sg list and fix a W=1 copiler warning Set the urb->actual_length to bytes successfully copied in case all bytes weren't copied from a temporary buffer to the URB sg list. Also print a debug message Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20210617150354.1512157-4-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 2728365..9248ce8 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1361,12 +1361,17 @@ static void xhci_unmap_temp_buf(struct usb_hcd *hcd, struct urb *urb) urb->transfer_buffer_length, dir); - if (usb_urb_dir_in(urb)) + if (usb_urb_dir_in(urb)) { len = sg_pcopy_from_buffer(urb->sg, urb->num_sgs, urb->transfer_buffer, buf_len, 0); - + if (len != buf_len) { + xhci_dbg(hcd_to_xhci(hcd), + "Copy from tmp buf to urb sg list failed\n"); + urb->actual_length = len; + } + } urb->transfer_flags &= ~URB_DMA_MAP_SINGLE; kfree(urb->transfer_buffer); urb->transfer_buffer = NULL;