Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f537da68 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

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: default avatarMing Lei <tom.leiming@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 572538de

drivers/usb/core/hcd.c

+2 −1
Original line number Diff line number Diff line
@@ -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,
@@ -1338,6 +1338,7 @@ static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, 
				return ret;

			urb->transfer_flags |= URB_SETUP_MAP_LOCAL;

		}

	}



	dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;

	if (urb->transfer_buffer_length != 0