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

Commit bde654a5 authored by Sekhar Nori's avatar Sekhar Nori Committed by Greg Kroah-Hartman
Browse files

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: default avatarCarlos Hernandez <ceh@ti.com>
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarGreg 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);