From patchwork Mon Dec 21 20:10:25 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alan Stern <stern@rowland.harvard.edu>
X-Patchwork-Id: 69159
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBLKAScY013709
	for <patchwork-acpi@patchwork.kernel.org>;
	Mon, 21 Dec 2009 20:10:28 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756696AbZLUUK1 (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Mon, 21 Dec 2009 15:10:27 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755716AbZLUUK1
	(ORCPT <rfc822;linux-acpi-outgoing>);
	Mon, 21 Dec 2009 15:10:27 -0500
Received: from iolanthe.rowland.org ([192.131.102.54]:33561 "HELO
	iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with SMTP id S1756696AbZLUUK0 (ORCPT
	<rfc822; linux-acpi@vger.kernel.org>); Mon, 21 Dec 2009 15:10:26 -0500
Received: (qmail 27440 invoked by uid 2102); 21 Dec 2009 15:10:25 -0500
Received: from localhost (sendmail-bs@127.0.0.1)
	by localhost with SMTP; 21 Dec 2009 15:10:25 -0500
Date: Mon, 21 Dec 2009 15:10:25 -0500 (EST)
From: Alan Stern <stern@rowland.harvard.edu>
X-X-Sender: stern@iolanthe.rowland.org
To: "Rafael J. Wysocki" <rjw@sisk.pl>
cc: pm list <linux-pm@lists.linux-foundation.org>,
	ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: Re: [RFC] Asynchronous suspend/resume - test results
In-Reply-To: <200912210140.19713.rjw@sisk.pl>
Message-ID: <Pine.LNX.4.44L0.0912211200200.2979-100000@iolanthe.rowland.org>
MIME-Version: 1.0
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org


Index: usb-2.6/drivers/usb/host/ohci-hub.c
===================================================================
--- usb-2.6.orig/drivers/usb/host/ohci-hub.c
+++ usb-2.6/drivers/usb/host/ohci-hub.c
@@ -333,14 +333,12 @@ static void ohci_finish_controller_resum
 		}
 	}
 
-	/* If needed, reinitialize and suspend the root hub */
+	/* If needed, reinitialize the root hub */
 	if (need_reinit) {
 		spin_lock_irq(&ohci->lock);
 		hcd->state = HC_STATE_RESUMING;
-		ohci_rh_resume(ohci);
-		hcd->state = HC_STATE_QUIESCING;
-		ohci_rh_suspend(ohci, 0);
-		hcd->state = HC_STATE_SUSPENDED;
+		if (ohci_rh_resume(ohci) == 0)
+			hcd->state = HC_STATE_RUNNING;
 		spin_unlock_irq(&ohci->lock);
 	}
 
Index: usb-2.6/drivers/usb/host/uhci-hcd.c
===================================================================
--- usb-2.6.orig/drivers/usb/host/uhci-hcd.c
+++ usb-2.6/drivers/usb/host/uhci-hcd.c
@@ -835,7 +835,6 @@ static int uhci_pci_resume(struct usb_hc
 
 		/* The controller had to be reset */
 		usb_root_hub_lost_power(hcd->self.root_hub);
-		suspend_rh(uhci, UHCI_RH_SUSPENDED);
 	}
 
 	spin_unlock_irq(&uhci->lock);