diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:01:40 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:01:40 +0200 |
commit | e52cff8bdd4a30c40a7f65c7ea8f1f425f8a15eb (patch) | |
tree | 1729332ebab51bb560ca64effe46cdab38ab537f /drivers/sh | |
parent | 405a1086bdd091d2d55db0ac905cd6332b35cec1 (diff) | |
parent | f5ce1572109049b90484e2bb44927cb6034c5eb1 (diff) | |
download | kernel_goldelico_gta04-e52cff8bdd4a30c40a7f65c7ea8f1f425f8a15eb.zip kernel_goldelico_gta04-e52cff8bdd4a30c40a7f65c7ea8f1f425f8a15eb.tar.gz kernel_goldelico_gta04-e52cff8bdd4a30c40a7f65c7ea8f1f425f8a15eb.tar.bz2 |
Merge branch 'pm-assorted'
* pm-assorted:
PM / QoS: Add pm_qos and dev_pm_qos to events-power.txt
PM / QoS: Add dev_pm_qos_request tracepoints
PM / QoS: Add pm_qos_request tracepoints
PM / QoS: Add pm_qos_update_target/flags tracepoints
PM / QoS: Update Documentation/power/pm_qos_interface.txt
PM / Sleep: Print last wakeup source on failed wakeup_count write
PM / QoS: correct the valid range of pm_qos_class
PM / wakeup: Adjust messaging for wake events during suspend
PM / Runtime: Update .runtime_idle() callback documentation
PM / Runtime: Rework the "runtime idle" helper routine
PM / Hibernate: print physical addresses consistently with other parts of kernel
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/pm_runtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index afe9282..8afa5a4 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -25,7 +25,7 @@ static int default_platform_runtime_idle(struct device *dev) { /* suspend synchronously to disable clocks immediately */ - return pm_runtime_suspend(dev); + return 0; } static struct dev_pm_domain default_pm_domain = { |