From: Ming Lei <tom.leiming@gmail.com>
Date: Wed, 12 May 2010 15:38:12 +0000 (+0800)
Subject: USB: add missing "{}" in map_urb_for_dma
X-Git-Tag: v2.6.34.3~1
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=6873ebd2fb776ecef3649d5a0bd85382d8684b8f;p=unionfs-2.6.39.y.git

USB: add missing "{}" in map_urb_for_dma

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>
---

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index b60a14d8f13..4f157453d42 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1330,7 +1330,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,
@@ -1340,6 +1340,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;