Commit fe2072cc authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

usb/hcd: Ensure scatter-gather is not used for isoc transfers 



We don't support sg for isoc transfers, enforce this.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5cf9212

drivers/usb/core/hcd.c

+9 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,15 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, 
	    && !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) {

		if (hcd->self.uses_dma) {

			if (urb->num_sgs) {

				int n = dma_map_sg(

				int n;



				/* We don't support sg for isoc transfers ! */

				if (usb_endpoint_xfer_isoc(&urb->ep->desc)) {

					WARN_ON(1);

					return -EINVAL;

				}



				n = dma_map_sg(

						hcd->self.controller,

						urb->sg,

						urb->num_sgs,