From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:49223 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754866AbbG3BuA (ORCPT ); Wed, 29 Jul 2015 21:50:00 -0400 Subject: Patch "usb: musb: host: rely on port_mode to call musb_start()" has been added to the 4.1-stable tree To: balbi@ti.com, bigeasy@linutronix.de, gregkh@linuxfoundation.org, nsekhar@ti.com Cc: , From: Date: Wed, 29 Jul 2015 18:49:58 -0700 Message-ID: <143822099876200@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled usb: musb: host: rely on port_mode to call musb_start() to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-musb-host-rely-on-port_mode-to-call-musb_start.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From be9d39881fc4fa39a64b6eed6bab5d9ee5125344 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Tue, 2 Jun 2015 13:03:36 -0500 Subject: usb: musb: host: rely on port_mode to call musb_start() From: Felipe Balbi commit be9d39881fc4fa39a64b6eed6bab5d9ee5125344 upstream. Currently, we're calling musb_start() twice for DRD ports in some situations. This has been observed to cause enumeration issues after suspend/resume cycles with AM335x. In order to fix the problem, we just have to fix the check on musb_has_gadget() so that it only returns true if current mode is Host and ignore the fact that we have or not a gadget driver loaded. Fixes: ae44df2e21b5 (usb: musb: call musb_start() only once in OTG mode) Cc: Sebastian Andrzej Siewior Tested-by: Sekhar Nori Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/musb/musb_virthub.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c @@ -273,9 +273,7 @@ static int musb_has_gadget(struct musb * #ifdef CONFIG_USB_MUSB_HOST return 1; #else - if (musb->port_mode == MUSB_PORT_MODE_HOST) - return 1; - return musb->g.dev.driver != NULL; + return musb->port_mode == MUSB_PORT_MODE_HOST; #endif } Patches currently in stable-queue which might be from balbi@ti.com are queue-4.1/usb-f_mass_storage-limit-number-of-reported-luns.patch queue-4.1/usb-dwc3-reset-the-transfer-resource-index-on-set_interface.patch queue-4.1/usb-musb-host-rely-on-port_mode-to-call-musb_start.patch queue-4.1/usb-gadget-mv_udc_core-fix-phy_regs-i-o-memory-leak.patch queue-4.1/usb-dwc3-gadget-don-t-clear-ep_busy-too-early.patch queue-4.1/usb-gadget-composite-fix-null-pointer-dereference.patch queue-4.1/usb-dwc3-gadget-return-error-if-command-sent-to-depcmd-register-fails.patch queue-4.1/usb-phy-mxs-suspend-to-ram-causes-null-pointer-dereference.patch queue-4.1/usb-gadget-f_fs-do-not-set-cancel-function-on-synchronous-read-write.patch queue-4.1/usb-dwc3-gadget-return-error-if-command-sent-to-dgcmd-register-fails.patch