diff options
author | Ming Lei <tom.leiming@gmail.com> | 2010-05-12 11:38:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:45 -0400 |
commit | f537da685c35a81a75f6067751bddb902c8adb68 (patch) | |
tree | e64468f663478ec9da7441606c93b12c3865e1da /drivers/usb | |
parent | 572538dee7a4b25f3e77fdc11d20dbb753ecf367 (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 <tom.leiming@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/hcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 297c92e4bf8d..12742f152f43 100644 --- 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, | |||
1327 | urb->setup_dma)) | 1327 | urb->setup_dma)) |
1328 | return -EAGAIN; | 1328 | return -EAGAIN; |
1329 | urb->transfer_flags |= URB_SETUP_MAP_SINGLE; | 1329 | urb->transfer_flags |= URB_SETUP_MAP_SINGLE; |
1330 | } else if (hcd->driver->flags & HCD_LOCAL_MEM) | 1330 | } else if (hcd->driver->flags & HCD_LOCAL_MEM) { |
1331 | ret = hcd_alloc_coherent( | 1331 | ret = hcd_alloc_coherent( |
1332 | urb->dev->bus, mem_flags, | 1332 | urb->dev->bus, mem_flags, |
1333 | &urb->setup_dma, | 1333 | &urb->setup_dma, |
@@ -1337,6 +1337,7 @@ static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, | |||
1337 | if (ret) | 1337 | if (ret) |
1338 | return ret; | 1338 | return ret; |
1339 | urb->transfer_flags |= URB_SETUP_MAP_LOCAL; | 1339 | urb->transfer_flags |= URB_SETUP_MAP_LOCAL; |
1340 | } | ||
1340 | } | 1341 | } |
1341 | 1342 | ||
1342 | dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; | 1343 | dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; |