Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752690AbdGZOV5 (ORCPT ); Wed, 26 Jul 2017 10:21:57 -0400 Received: from iolanthe.rowland.org ([192.131.102.54]:48372 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752465AbdGZOVz (ORCPT ); Wed, 26 Jul 2017 10:21:55 -0400 Date: Wed, 26 Jul 2017 10:21:54 -0400 (EDT) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: "Rafael J. Wysocki" cc: Linux USB , Linux PM , LKML , Greg Kroah-Hartman , Mathias Nyman , Felipe Balbi Subject: Re: [PATCH] USB: hcd: Mark secondary HCD as dead if the primary one died In-Reply-To: <2812577.lIftRZubdO@aspire.rjw.lan> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1291 Lines: 35 On Tue, 25 Jul 2017, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > Make usb_hc_died() clear the HCD_FLAG_RH_RUNNING flag for the shared > HCD and set HCD_FLAG_DEAD for it, in analogy with what is done for > the primary one. > > Among other thigs, this prevents check_root_hub_suspended() from > returning -EBUSY for dead HCDs which helps to work around system > suspend issues in some situations. > > This actually fixes occasional suspend failures on one of my test > machines. > > Suggested-by: Alan Stern > Signed-off-by: Rafael J. Wysocki > --- > drivers/usb/core/hcd.c | 2 ++ > 1 file changed, 2 insertions(+) > > Index: linux-pm/drivers/usb/core/hcd.c > =================================================================== > --- linux-pm.orig/drivers/usb/core/hcd.c > +++ linux-pm/drivers/usb/core/hcd.c > @@ -2485,6 +2485,8 @@ void usb_hc_died (struct usb_hcd *hcd) > } > if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) { > hcd = hcd->shared_hcd; > + clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags); > + set_bit(HCD_FLAG_DEAD, &hcd->flags); > if (hcd->rh_registered) { > clear_bit(HCD_FLAG_POLL_RH, &hcd->flags); Acked-by: Alan Stern