PM: don't skip device PM init when CONFIG_PM_SLEEP isn't set and CONFIG_PM is set
authorAlan Stern <stern@rowland.harvard.edu>
Thu, 7 Aug 2008 17:06:12 +0000 (13:06 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Aug 2008 17:15:36 +0000 (10:15 -0700)
commit3b98aeaf3a75f544dc945694f4fcf6e1c4bab89d
treebebaa8c3353ba9e7d5142dc73c767dc030bca7e3
parent7c2250352e11bf956c4cfa20b01ae6ba72882788
PM: don't skip device PM init when CONFIG_PM_SLEEP isn't set and CONFIG_PM is set

This patch (as1124) fixes a couple of bugs in the PM core.  The new
dev->power.status field should be initialized regardless of whether
CONFIG_PM_SLEEP is enabled, and similarly dpm_sysfs_add() should be
called whenever CONFIG_PM is enabled.

The patch separates out the call to dpm_sysfs_add() from the call to
device_pm_add().  As a result device_pm_add() can no longer return an
error, so its return type is changed to void.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Romit Dasgupta <romit@ti.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/base/core.c
drivers/base/power/main.c
drivers/base/power/power.h