From: Matthijs Kooijman Date: Fri, 19 Jul 2013 09:34:23 +0000 (+0200) Subject: staging: dwc2: when dma is disabled, clear hcd->self.uses_dma X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7de76ee118ce013bb17c924515cb45464d8a059b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git staging: dwc2: when dma is disabled, clear hcd->self.uses_dma When dma is disabled inside dwc2 (because the hardware does not support it, or the code was changed to disable it for testing), let the usb core know about this by clearing hcd->self.uses_dma. By default, the usb core assumes that dma is used when a dma_mask is set, but this might not always match the dma_enable value in dwc2. To prevent problems resulting from a mismatch, better to explicitely disable dma in this case (though everything seemed to work with the wrong value of uses_dma as well, probably only resulted in some unneeded work). Signed-off-by: Matthijs Kooijman Acked-by: Paul Zimmerman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dwc2/hcd.c b/drivers/staging/dwc2/hcd.c index f77e66333ac7..fbacf6a9f72e 100644 --- a/drivers/staging/dwc2/hcd.c +++ b/drivers/staging/dwc2/hcd.c @@ -2854,6 +2854,9 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq, if (!hcd) goto error1; + if (hsotg->core_params->dma_enable <= 0) + hcd->self.uses_dma = 0; + hcd->has_tt = 1; spin_lock_init(&hsotg->lock);