From e754f55d59bbddff0748b044be450aba2c3b1ab5 Mon Sep 17 00:00:00 2001
From: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Date: Mon, 21 Apr 2008 13:48:22 +0900
Subject: [PATCH] --- yaml --- r: 95793 b: refs/heads/master c:
 e2722528ce688eecf574c237f7656d3934d4f23c h: refs/heads/master i:   95791:
 911a7d7d7bbd11e12d3372b3950bbabf75f54c10 v: v3

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

diff --git a/[refs] b/[refs]
index 3cf8820e39e1..11fd7a390244 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a6ad1dd86a45da8f235300349d4abd9ae7d1a21
+refs/heads/master: e2722528ce688eecf574c237f7656d3934d4f23c
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index e819e5359d57..3e69266e1f4d 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -394,7 +394,9 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
 	if (!io->urbs)
 		goto nomem;
 
-	urb_flags = URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT;
+	urb_flags = URB_NO_INTERRUPT;
+	if (dma)
+		urb_flags |= URB_NO_TRANSFER_DMA_MAP;
 	if (usb_pipein(pipe))
 		urb_flags |= URB_SHORT_NOT_OK;