From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754330AbcIHCju (ORCPT ); Wed, 7 Sep 2016 22:39:50 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52514 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753106AbcIHCjm (ORCPT ); Wed, 7 Sep 2016 22:39:42 -0400 X-Sasl-enc: MD61Ad0jnA2+qfT7SVUZpycv7ATj9gBHgn0rWrrkFP+D 1473302379 Date: Wed, 07 Sep 2016 19:39:37 -0700 Message-Id: In-Reply-To: References: From: John Youn To: John Youn To: Felipe Balbi To: Greg Kroah-Hartman To: linux-usb@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: Remi Pommarel Cc: Caesar Wang Cc: Kever Yang Cc: Tao Huang Cc: Michael Niewoehner Cc: Stefan Wahren Cc: Stephen Warren Cc: Heiko Stuebner Cc: Julius Werner Cc: Doug Anderson Subject: [PATCH v5 1/3] usb: dwc2: gadget: Only initialize device if in device mode Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In dwc2_hsotg_udc_start(), don't initialize the controller for device mode unless we are actually in device mode. Tested-by: Heiko Stuebner Tested-by: Stefan Wahren Signed-off-by: John Youn --- drivers/usb/dwc2/gadget.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 94bd19a..4cd6403 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -3466,8 +3466,11 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget, otg_set_peripheral(hsotg->uphy->otg, &hsotg->gadget); spin_lock_irqsave(&hsotg->lock, flags); - dwc2_hsotg_init(hsotg); - dwc2_hsotg_core_init_disconnected(hsotg, false); + if (dwc2_hw_is_device(hsotg)) { + dwc2_hsotg_init(hsotg); + dwc2_hsotg_core_init_disconnected(hsotg, false); + } + hsotg->enabled = 0; spin_unlock_irqrestore(&hsotg->lock, flags); -- 2.9.0