]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
usb: dwc2: fixes host_dma logic
authorChristian Lamparter <chunkeey@googlemail.com>
Tue, 15 Nov 2016 12:11:55 +0000 (14:11 +0200)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Fri, 18 Nov 2016 11:54:50 +0000 (13:54 +0200)
This patch moves the the host_dma initialization
before dwc2_set_param_dma_desc_enable() and
dwc2_set_param_dma_desc_fs_enable(). The reason being
that both function need it.

Fixes: 1205489cee75bf39 ("usb: dwc2: Get host DMA device properties")
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc2/params.c

index 1bf3b0936d872675e63c6b7ee70b7a4f8a5cbbdf..513556a59f3854a7e8af1daf27cc63cc3b508e2f 100644 (file)
@@ -1123,9 +1123,6 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
        bool dma_capable = !(hw->arch == GHWCFG2_SLAVE_ONLY_ARCH);
 
        dwc2_set_param_otg_cap(hsotg, params->otg_cap);
-       dwc2_set_param_dma_desc_enable(hsotg, params->dma_desc_enable);
-       dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
-
        if ((hsotg->dr_mode == USB_DR_MODE_HOST) ||
            (hsotg->dr_mode == USB_DR_MODE_OTG)) {
                dev_dbg(hsotg->dev, "Setting HOST parameters\n");
@@ -1135,6 +1132,8 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
                                    true, false,
                                    dma_capable);
        }
+       dwc2_set_param_dma_desc_enable(hsotg, params->dma_desc_enable);
+       dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
 
        dwc2_set_param_host_support_fs_ls_low_power(hsotg,
                        params->host_support_fs_ls_low_power);