diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:23:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:23:17 +0100 |
| commit | 6e2d9b6049df91b1e380fd9d05eb7e585bcf8415 (patch) | |
| tree | 36063e72f2759fd728ce846b531d4907f8f52a54 /drivers | |
| parent | ce6bceabae166c2100133d6306cf3a8b494f3540 (diff) | |
| parent | d66e6db28df330c0e5b61f9863754fc2fd37f8ca (diff) | |
| download | linux-6e2d9b6049df91b1e380fd9d05eb7e585bcf8415.tar.bz2 | |
Merge branch 'pm-runtime'
* pm-runtime:
PM / Runtime: Respect autosuspend when idle triggers suspend
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/runtime.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 268a35097578..72e00e66ecc5 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -258,7 +258,8 @@ static int __rpm_callback(int (*cb)(struct device *), struct device *dev) * Check if the device's runtime PM status allows it to be suspended. If * another idle notification has been started earlier, return immediately. If * the RPM_ASYNC flag is set then queue an idle-notification request; otherwise - * run the ->runtime_idle() callback directly. + * run the ->runtime_idle() callback directly. If the ->runtime_idle callback + * doesn't exist or if it returns 0, call rpm_suspend with the RPM_AUTO flag. * * This function must be called under dev->power.lock with interrupts disabled. */ @@ -331,7 +332,7 @@ static int rpm_idle(struct device *dev, int rpmflags) out: trace_rpm_return_int(dev, _THIS_IP_, retval); - return retval ? retval : rpm_suspend(dev, rpmflags); + return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); } /** |