From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 9 Jul 2012 13:57:00 +0000 (+0200)
Subject: usb/hcd: Ensure scatter-gather is not used for isoc transfers
X-Git-Tag: upstream/snapshot3+hdmi~6973^2~24^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe2072cc1768b0f979195acf19b8ccd381e541c3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 190b1ec7..bc84106 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -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,