From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux USB <linux-usb@vger.kernel.org>
Cc: Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Alan Stern <stern@rowland.harvard.edu>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mathias Nyman <mathias.nyman@linux.intel.com>,
Felipe Balbi <balbi@kernel.org>
Subject: [PATCH] PM / USB: hcd_pci: Skip secondary root hub check for HCD_DEAD()
Date: Tue, 25 Jul 2017 01:04:01 +0200 [thread overview]
Message-ID: <5273465.xcnvLcBNTW@aspire.rjw.lan> (raw)
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
If HCD_DEAD(hcd) is "true" in check_root_hub_suspended(), it is
rather pointless to check the secondary root hub, so return early
then.
This actually fixes occasional suspend failures on one of my test
machines.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/usb/core/hcd-pci.c | 3 +++
1 file changed, 3 insertions(+)
Index: linux-pm/drivers/usb/core/hcd-pci.c
===================================================================
--- linux-pm.orig/drivers/usb/core/hcd-pci.c
+++ linux-pm/drivers/usb/core/hcd-pci.c
@@ -427,6 +427,9 @@ static int check_root_hub_suspended(stru
dev_warn(dev, "Root hub is not suspended\n");
return -EBUSY;
}
+ if (HCD_DEAD(hcd))
+ return 0;
+
if (hcd->shared_hcd) {
hcd = hcd->shared_hcd;
if (HCD_RH_RUNNING(hcd)) {
next reply other threads:[~2017-07-24 23:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 23:04 Rafael J. Wysocki [this message]
2017-07-25 14:05 ` Alan Stern
2017-07-25 15:59 ` Rafael J. Wysocki
2017-07-25 20:35 ` Rafael J. Wysocki
2017-07-25 21:06 ` Alan Stern
2017-07-25 21:36 ` Rafael J. Wysocki
2017-07-25 21:58 ` [PATCH] USB: hcd: Mark secondary HCD as dead if the primary one died Rafael J. Wysocki
2017-07-26 14:21 ` Alan Stern
2017-07-26 17:07 ` Rafael J. Wysocki
2017-07-30 14:13 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5273465.xcnvLcBNTW@aspire.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®