Commit bde654a5 authored Apr 03, 2017 by Sekhar Nori Committed by Greg Kroah-Hartman Apr 08, 2017

usb: hcd: use correct device pointer for dma ops



commit a8c06e40 ("usb: separate out sysdev pointer from
usb_bus") converted to use hcd->self.sysdev for DMA
operations instead of hcd->self.controller but forgot to do
it for one instance.

This gets caught when DMA debugging is enabled since dma map
and unmap end up using different device pointers.

Fix it.

Fixes: a8c06e40 ("usb: separate out sysdev pointer from usb_bus")
Reported-by: Carlos Hernandez <ceh@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cb2e3d46

drivers/usb/core/hcd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1436,7 +1436,7 @@ void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd hcd, struct urb urb)
		{
		if (IS_ENABLED(CONFIG_HAS_DMA) &&
		(urb->transfer_flags & URB_SETUP_MAP_SINGLE))
		dma_unmap_single(hcd->self.controller,
		dma_unmap_single(hcd->self.sysdev,
		urb->setup_dma,
		sizeof(struct usb_ctrlrequest),
		DMA_TO_DEVICE);

Admin message