diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-08-08 19:05:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-21 13:15:37 -0400 |
commit | f5a6d958b5d0a10e7e7a9dee1862fb31d08c6d26 (patch) | |
tree | 9d5eb758a374684a53f1b55a560d728d3213d2d3 | |
parent | c906a48adc74fc455378137ac5124b13e7030a15 (diff) |
PM: Remove WARN_ON from device_pm_add
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>
-rw-r--r-- | 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 284f564bb12b..273a944d4040 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
@@ -74,11 +74,9 @@ void device_pm_add(struct device *dev) | |||
74 | kobject_name(&dev->kobj)); | 74 | kobject_name(&dev->kobj)); |
75 | mutex_lock(&dpm_list_mtx); | 75 | mutex_lock(&dpm_list_mtx); |
76 | if (dev->parent) { | 76 | if (dev->parent) { |
77 | if (dev->parent->power.status >= DPM_SUSPENDING) { | 77 | if (dev->parent->power.status >= DPM_SUSPENDING) |
78 | dev_warn(dev, "parent %s is sleeping, will not add\n", | 78 | dev_warn(dev, "parent %s should not be sleeping\n", |
79 | dev->parent->bus_id); | 79 | dev->parent->bus_id); |
80 | WARN_ON(true); | ||
81 | } | ||
82 | } else if (transition_started) { | 80 | } else if (transition_started) { |
83 | /* | 81 | /* |
84 | * We refuse to register parentless devices while a PM | 82 | * We refuse to register parentless devices while a PM |