From e26ab6670b7fcdf7e2fa313c58ff440a8c75fde1 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 9 Jul 2012 15:57:00 +0200
Subject: [PATCH] --- yaml --- r: 316997 b: refs/heads/master c:
 fe2072cc1768b0f979195acf19b8ccd381e541c3 h: refs/heads/master i:   316995:
 3cd1de24b06e4ca155b9bb82f779a0421eb5c099 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/usb/core/hcd.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f0845a1dbd8f..1dc409760637 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5cf9212a368d88fe1e25797699b167f6daa64a5
+refs/heads/master: fe2072cc1768b0f979195acf19b8ccd381e541c3
diff --git a/trunk/drivers/usb/core/hcd.c b/trunk/drivers/usb/core/hcd.c
index 190b1ec7bdcb..bc84106ac057 100644
--- a/trunk/drivers/usb/core/hcd.c
+++ b/trunk/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,