Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965115AbcKKU7U (ORCPT ); Fri, 11 Nov 2016 15:59:20 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36779 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934727AbcKKU7R (ORCPT ); Fri, 11 Nov 2016 15:59:17 -0500 From: Christian Lamparter X-Google-Original-From: Christian Lamparter To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: John Youn , Mark Rutland , Rob Herring , Greg Kroah-Hartman , Felipe Balbi Subject: [PATCH 2/2] usb: dwc2: fixes host_dma logic Date: Fri, 11 Nov 2016 21:59:14 +0100 Message-Id: <4043f817106c8dffdc9a3f411d965465168b263d.1478897792.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1458 Lines: 39 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") Cc: John Youn Cc: Felipe Balbi Signed-off-by: Christian Lamparter --- drivers/usb/dwc2/params.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c index 5d822c5..222a83c 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -1157,9 +1157,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)) { bool disable; @@ -1174,6 +1171,8 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg, !disable, 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); -- 2.10.2