usb: hcd: use correct device pointer for dma ops
authorSekhar Nori <nsekhar@ti.com>
Mon, 3 Apr 2017 08:26:52 +0000 (13:56 +0530)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:22:23 +0000 (15:22 -0500)
commit a8c06e407ef9 ("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: a8c06e407ef9 ("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>
(cherry picked from commit bde654a55adca166641361332e1f141de5197b02)

drivers/usb/core/hcd.c

index ff3e925..cc41216 100644 (file)
@@ -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);