From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966477AbbJ1OT1 (ORCPT ); Wed, 28 Oct 2015 10:19:27 -0400 Received: from mx2.suse.de ([195.135.220.15]:34663 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966186AbbJ1NyN (ORCPT ); Wed, 28 Oct 2015 09:54:13 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Roger Quadros , Mathias Nyman , Jiri Slaby Subject: [PATCH 3.12 058/123] usb: xhci: Clear XHCI_STATE_DYING on start Date: Wed, 28 Oct 2015 14:52:49 +0100 Message-Id: <00a41ccfc8559efbfa9eb3e9d953aa7fbb233396.1446021555.git.jslaby@suse.cz> X-Mailer: git-send-email 2.6.2 In-Reply-To: <5584351853aa18c1d059ebc63948faa4aa0bbdd3.1446021555.git.jslaby@suse.cz> References: <5584351853aa18c1d059ebc63948faa4aa0bbdd3.1446021555.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roger Quadros 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit e5bfeab0ad515b4f6df39fe716603e9dc6d3dfd0 upstream. For whatever reason if XHCI died in the previous instant then it will never recover on the next xhci_start unless we clear the DYING flag. Signed-off-by: Roger Quadros Signed-off-by: Mathias Nyman Signed-off-by: Jiri Slaby --- drivers/usb/host/xhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 1dd08da9652a..319515406b4f 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -143,7 +143,8 @@ static int xhci_start(struct xhci_hcd *xhci) "waited %u microseconds.\n", XHCI_MAX_HALT_USEC); if (!ret) - xhci->xhc_state &= ~XHCI_STATE_HALTED; + xhci->xhc_state &= ~(XHCI_STATE_HALTED | XHCI_STATE_DYING); + return ret; } -- 2.6.2