On Wed, 15 Aug 2012, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <[email protected]> > Subject: PM / Runtime: Check device PM QoS setting before "no callbacks" > > If __dev_pm_qos_read_value(dev) returns a negative value, > rpm_suspend() should return -EPERM for dev even if its > power.no_callbacks flag is set. For this to happen, the device's > power.no_callbacks flag has to be checked after the PM QoS check, > so move the PM QoS check to rpm_check_suspend_allowed() (this will > make it cover idle notifications as well as runtime suspend too). > > Signed-off-by: Rafael J. Wysocki <[email protected]> > --- > drivers/base/power/runtime.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > Index: linux/drivers/base/power/runtime.c > =================================================================== > --- linux.orig/drivers/base/power/runtime.c > +++ linux/drivers/base/power/runtime.c > @@ -147,6 +147,8 @@ static int rpm_check_suspend_allowed(str > || (dev->power.request_pending > && dev->power.request == RPM_REQ_RESUME)) > retval = -EAGAIN; > + else if (__dev_pm_qos_read_value(dev) < 0) > + retval = -EPERM; > else if (dev->power.runtime_status == RPM_SUSPENDED) > retval = 1; > > @@ -402,12 +404,6 @@ static int rpm_suspend(struct device *de > goto out; > } > > - if (__dev_pm_qos_read_value(dev) < 0) { > - /* Negative PM QoS constraint means "never suspend". */ > - retval = -EPERM; > - goto out; > - } > - > __update_runtime_status(dev, RPM_SUSPENDING); > > if (dev->pm_domain)
Acked-by: Alan Stern <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
