From patchwork Tue Jan 25 18:08:36 2011
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: 506591
Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org
	[140.211.169.13])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0PIC4k0022793
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL)
	for <patchwork-linux-pm@patchwork.kernel.org>;
	Tue, 25 Jan 2011 18:12:26 GMT
Received: from daredevil.linux-foundation.org (localhost [127.0.0.1])
	by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with
	ESMTP id p0PI9B47009578; Tue, 25 Jan 2011 10:09:41 -0800
Received: from iolanthe.rowland.org (iolanthe.rowland.org [192.131.102.54])
	by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1)
	with
	SMTP id p0PI8b4F009539 for <linux-pm@lists.linux-foundation.org>;
	Tue, 25 Jan 2011 10:08:39 -0800
Received: (qmail 3298 invoked by uid 2102); 25 Jan 2011 13:08:36 -0500
Received: from localhost (sendmail-bs@127.0.0.1)
	by localhost with SMTP; 25 Jan 2011 13:08:36 -0500
Date: Tue, 25 Jan 2011 13:08:36 -0500 (EST)
From: Alan Stern <stern@rowland.harvard.edu>
X-X-Sender: stern@iolanthe.rowland.org
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Message-ID: <Pine.LNX.4.44L0.1101251307060.1867-100000@iolanthe.rowland.org>
MIME-Version: 1.0
Received-SPF: pass (localhost is always allowed.)
X-Spam-Status: No, hits=-5.489 required=5 tests=AWL, BAYES_00,
	OSDL_HEADER_SUBJECT_BRACKETED, PATCH_SUBJECT_OSDL
X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__
X-MIMEDefang-Filter: lf$Revision: 1.188 $
X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21
Cc: tim blechmann <tim@klingt.org>,
	Linux-pm mailing list <linux-pm@lists.linux-foundation.org>
Subject: [linux-pm] [PATCH] PM: don't enable interrupts while running
	in_interrupt
X-BeenThere: linux-pm@lists.linux-foundation.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Linux power management <linux-pm.lists.linux-foundation.org>
List-Unsubscribe: 
 <https://lists.linux-foundation.org/mailman/listinfo/linux-pm>,
	<mailto:linux-pm-request@lists.linux-foundation.org?subject=unsubscribe>
List-Archive: <http://lists.linux-foundation.org/pipermail/linux-pm>
List-Post: <mailto:linux-pm@lists.linux-foundation.org>
List-Help: <mailto:linux-pm-request@lists.linux-foundation.org?subject=help>
List-Subscribe: 
 <https://lists.linux-foundation.org/mailman/listinfo/linux-pm>,
	<mailto:linux-pm-request@lists.linux-foundation.org?subject=subscribe>
Sender: linux-pm-bounces@lists.linux-foundation.org
Errors-To: linux-pm-bounces@lists.linux-foundation.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 25 Jan 2011 18:12:26 +0000 (UTC)


Index: usb-2.6/drivers/base/power/runtime.c
===================================================================
--- usb-2.6.orig/drivers/base/power/runtime.c
+++ usb-2.6/drivers/base/power/runtime.c
@@ -407,12 +407,15 @@ static int rpm_suspend(struct device *de
 		goto out;
 	}
 
+	/* Maybe the parent is now able to suspend. */
 	if (parent && !parent->power.ignore_children && !dev->power.irq_safe) {
-		spin_unlock_irq(&dev->power.lock);
+		spin_unlock(&dev->power.lock);
 
-		pm_request_idle(parent);
+		spin_lock(&parent->power.lock);
+		rpm_idle(parent, RPM_ASYNC);
+		spin_unlock(&parent->power.lock);
 
-		spin_lock_irq(&dev->power.lock);
+		spin_lock(&dev->power.lock);
 	}
 
  out: