[PATCH 09/15] PM: Remove WARN_ON from device_pm_add

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-kernel@...>
Cc: Rafael J. Wysocki <rjw@...>, Greg Kroah-Hartman <gregkh@...>
Date: Thursday, August 21, 2008 - 1:32 pm

From: Rafael J. Wysocki <rjw@sisk.pl>

PM: Remove WARN_ON from device_pm_add

Fix message in device_pm_add() saying that the device will not be
added to dpm_list, although in fact the device is going to be added
to the list regardless of the ordering violation.

Remove the WARN_ON(true) triggered in that situation, because it is
hit by USB very often and spams the users' logs.

This patch fixes bug #11263

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/base/power/main.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 284f564..273a944 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -74,11 +74,9 @@ void device_pm_add(struct device *dev)
 		 kobject_name(&dev->kobj));
 	mutex_lock(&dpm_list_mtx);
 	if (dev->parent) {
-		if (dev->parent->power.status >= DPM_SUSPENDING) {
-			dev_warn(dev, "parent %s is sleeping, will not add\n",
+		if (dev->parent->power.status >= DPM_SUSPENDING)
+			dev_warn(dev, "parent %s should not be sleeping\n",
 				dev->parent->bus_id);
-			WARN_ON(true);
-		}
 	} else if (transition_started) {
 		/*
 		 * We refuse to register parentless devices while a PM
-- 
1.5.6.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 15/15] pnp: fix "add acpi:* modalias entries", Greg Kroah-Hartman, (Thu Aug 21, 1:33 pm)
[PATCH 14/15] UIO: generic irq handling for some uio platfor..., Greg Kroah-Hartman, (Thu Aug 21, 1:33 pm)
[PATCH 13/15] UIO: uio_pdrv: fix license specification, Greg Kroah-Hartman, (Thu Aug 21, 1:33 pm)
[PATCH 12/15] UIO: uio_pdrv: fix memory leak, Greg Kroah-Hartman, (Thu Aug 21, 1:33 pm)
[PATCH 11/15] block: drop references taken by class_find_dev..., Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 10/15] block: fix partial read() of /proc/{partitions..., Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 09/15] PM: Remove WARN_ON from device_pm_add, Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 08/15] driver core: add init_name to struct device, Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 07/15] PM: don't skip device PM init when CONFIG_PM_S..., Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 06/15] driver model: anti-oopsing medicine, Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
Re: [PATCH 06/15] driver model: anti-oopsing medicine, David Brownell, (Thu Aug 21, 2:24 pm)
[PATCH 05/15] dev_printk(): constify the `dev' argument, Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 04/15] drivers/base/driver.c: remove unused to_dev() ..., Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 03/15] Documentation: HOWTO-ja_JP-sync patch, Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 02/15] Japanese translation of Documentation/SubmitCh..., Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)
[PATCH 01/15] kobject: Replace ALL occurrences of '/' with '..., Greg Kroah-Hartman, (Thu Aug 21, 1:32 pm)