.34 commit

diff --git a/review-2.6.34/series b/review-2.6.34/series
index 429018a7993b8d214b8cd8a778c7570bbb20518c..860b592e1cdff1d7929083bd895c0231e972aef7 100644 (file)
--- a/review-2.6.34/series
+++ b/review-2.6.34/series
@@ -34,3 +34,4 @@ ssb-do-not-read-sprom-if-it-does-not-exist.patch
 ssb-look-for-sprom-at-different-offset-on-higher-rev-cc.patch
 ssb-fix-null-ptr-deref-when-pcihost_wrapper-is-used.patch
 ssb-handle-alternate-ssprom-location.patch
+usb-add-missing-in-map_urb_for_dma.patch

diff --git a/review-2.6.34/usb-add-missing-in-map_urb_for_dma.patch b/review-2.6.34/usb-add-missing-in-map_urb_for_dma.patch
new file mode 100644 (file)
index 0000000..f343de7
--- /dev/null
+++ b/review-2.6.34/usb-add-missing-in-map_urb_for_dma.patch
@@ -0,0 +1,40 @@
+From f537da685c35a81a75f6067751bddb902c8adb68 Mon Sep 17 00:00:00 2001
+From: Ming Lei <tom.leiming@gmail.com>
+Date: Wed, 12 May 2010 23:38:12 +0800
+Subject: USB: add missing "{}" in map_urb_for_dma
+
+From: Ming Lei <tom.leiming@gmail.com>
+
+commit f537da685c35a81a75f6067751bddb902c8adb68 upstream.
+
+Obviously, {} is needed in the branch of
+       "else if (hcd->driver->flags & HCD_LOCAL_MEM)"
+for handling of setup packet mapping.
+
+Signed-off-by: Ming Lei <tom.leiming@gmail.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/hcd.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -1330,7 +1330,7 @@ static int map_urb_for_dma(struct usb_hc
+                                               urb->setup_dma))
+                               return -EAGAIN;
+                       urb->transfer_flags |= URB_SETUP_MAP_SINGLE;
+-              } else if (hcd->driver->flags & HCD_LOCAL_MEM)
++              } else if (hcd->driver->flags & HCD_LOCAL_MEM) {
+                       ret = hcd_alloc_coherent(
+                                       urb->dev->bus, mem_flags,
+                                       &urb->setup_dma,
+@@ -1340,6 +1340,7 @@ static int map_urb_for_dma(struct usb_hc
+                       if (ret)
+                               return ret;
+                       urb->transfer_flags |= URB_SETUP_MAP_LOCAL;
++              }
+       }
+ 
+       dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;