aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMichael Scott <michael.scott@linaro.org>2015-03-10 13:15:02 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-18 13:22:28 +0100
commit8dbaea2b3d24e3a77e6a853ff76c19c5a6052f4e (patch)
tree6022017739773d9802ecd8c7288743b38ca985c3 /kernel
parent84ba11a6ee549b2727a3b83d3c1b455df1c7ebcd (diff)
PM / QoS: remove duplicate call to pm_qos_update_target
In 3.10.y backport patch 1dba303727f52ea062580b0a9b3f0c3b462769cf, the logic to call pm_qos_update_target was moved to __pm_qos_update_request. However, the original code was left in function pm_qos_update_request. Currently, if pm_qos_update_request is called where new_value != req->node.prio then pm_qos_update_target will be called twice in a row. Once in pm_qos_update_request and then again in the following call to _pm_qos_update_request. Removing the left over code from pm_qos_update_request stops this second call to pm_qos_update_target where the work of removing / re-adding the new_value in the constraints list would be duplicated. Signed-off-by: Michael Scott <michael.scott@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/qos.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 25cf89bc659e..8703fc729fb4 100644
--- a/kernel/power/qos.c
+++ b/kernel/power/qos.c
@@ -369,12 +369,6 @@ void pm_qos_update_request(struct pm_qos_request *req,
}
cancel_delayed_work_sync(&req->work);
-
- if (new_value != req->node.prio)
- pm_qos_update_target(
- pm_qos_array[req->pm_qos_class]->constraints,
- &req->node, PM_QOS_UPDATE_REQ, new_value);
-
__pm_qos_update_request(req, new_value);
}
EXPORT_SYMBOL_GPL(pm_qos_update_request);