diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-24 15:04:06 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-24 15:04:06 +0100 |
| commit | 4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641 (patch) | |
| tree | 4075d84f26fdd8e70ec62c9b541caa1ea23cebda /drivers/base | |
| parent | 5c1a07ab3e78ef68fc9ccf419c969e8ed88d7cb6 (diff) | |
| download | op-kernel-dev-4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641.zip op-kernel-dev-4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641.tar.gz | |
PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
The __pm_generic_resume() function changes the given device's runtime
PM status to RPM_ACTIVE if its driver's callback returns 0, but it
only should do that if the rumtime PM is enabled for the device.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/generic_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c index 3d2c3500..42f97f9 100644 --- a/drivers/base/power/generic_ops.c +++ b/drivers/base/power/generic_ops.c @@ -185,7 +185,7 @@ static int __pm_generic_resume(struct device *dev, int event) return 0; ret = callback(dev); - if (!ret) { + if (!ret && pm_runtime_enabled(dev)) { pm_runtime_disable(dev); pm_runtime_set_active(dev); pm_runtime_enable(dev); |
