summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-11-15 22:45:22 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:33:18 -0800
commitd81b749c9715e313331137024210ab2d11de8f1a (patch)
treeb2b21438d18a05b64d0965e4af9e5a7c0424d9f5 /kernel
parent2568726d42648e90951e8776195d697719eaa7a2 (diff)
downloadlinux-3.10-d81b749c9715e313331137024210ab2d11de8f1a.tar.gz
linux-3.10-d81b749c9715e313331137024210ab2d11de8f1a.tar.bz2
linux-3.10-d81b749c9715e313331137024210ab2d11de8f1a.zip
PM / PM QoS: Fix reversed min and max
commit 00fafcda1773245a5292f953321ec3f0668c8c28 upstream. pm_qos_get_value had min and max reversed, causing all pm_qos requests to have no effect. Signed-off-by: Colin Cross <ccross@android.com> Acked-by: mark <markgross@thegnar.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/pm_qos_params.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index 645e541a45f..0da2837416e 100644
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -120,10 +120,10 @@ static inline int pm_qos_get_value(struct pm_qos_object *o)
switch (o->type) {
case PM_QOS_MIN:
- return plist_last(&o->requests)->prio;
+ return plist_first(&o->requests)->prio;
case PM_QOS_MAX:
- return plist_first(&o->requests)->prio;
+ return plist_last(&o->requests)->prio;
default:
/* runtime check for not using enum */