projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
572538d
)
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)
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]
>
drivers/usb/core/hcd.c
patch
|
blob
|
history
diff --git
a/drivers/usb/core/hcd.c
b/drivers/usb/core/hcd.c
index 297c92e4bf8d48a5123ce49077174df0230ed62c..12742f152f431fedb567665c2ec3ce5845a98882 100644
(file)
--- a/
drivers/usb/core/hcd.c
+++ b/
drivers/usb/core/hcd.c
@@
-1327,7
+1327,7
@@
static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
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,
@@
-1337,6
+1337,7
@@
static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
if (ret)
return ret;
urb->transfer_flags |= URB_SETUP_MAP_LOCAL;
+ }
}
dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;