Title: [9046] trunk/drivers/usb/core/hcd.c: [#6147] kernel crash with none dma usb host hci
- Revision
- 9046
- Author
- hennerich
- Date
- 2010-08-04 06:43:27 -0400 (Wed, 04 Aug 2010)
Log Message
[#6147] kernel crash with none dma usb host hci
This bug was imported with update to stable linux-2.6.34.1 (svn rev
8971)
After debugging the issue myself, and on the way to find who to blame
for
this I found the same fix on upstream.
I really wonder why this hot fix doesn't went into linux-2.6.34.2?
Apply upstream:
USB: add missing "{}" in map_urb_for_dma
author Ming Lei <[email protected]>
Wed, 12 May 2010 15:38:12 +0000 (23:38 +0800)
committer Greg Kroah-Hartman <[email protected]>
Thu, 20 May 2010 20:21:45 +0000 (13:21 -0700)
commit f537da685c35a81a75f6067751bddb902c8adb68
tree e64468f663478ec9da7441606c93b12c3865e1da tree | snapshot
parent 572538dee7a4b25f3e77fdc11d20dbb753ecf367 commit | diff
USB: add missing "{}" in map_urb_for_dma
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 <[email protected]>
Acked-by: Alan Stern <[email protected]>
Cc: stable <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Modified Paths
Diff
Modified: trunk/drivers/usb/core/hcd.c (9045 => 9046)
--- trunk/drivers/usb/core/hcd.c 2010-08-04 06:54:10 UTC (rev 9045)
+++ trunk/drivers/usb/core/hcd.c 2010-08-04 10:43:27 UTC (rev 9046)
@@ -1330,7 +1330,7 @@
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 @@
if (ret)
return ret;
urb->transfer_flags |= URB_SETUP_MAP_LOCAL;
+ }
}
dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
