AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

PM / QoS: Use the correct variable to check the QoS request type

Browse Source 
Use the actual function argument for the validation of the request type,
instead of the type field in a fresh (supposedly zero-initialized)
request structure.

Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Jan H. Schönherr 2017-09-05 23:14:29 +02:00 committed by Rafael J. Wysocki
parent 2bd6bf03f4
commit 41ba8bd082
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/power/qos.c
View File

@ -277,11 +277,11 @@ void dev_pm_qos_constraints_destroy(struct device *dev)
mutex_unlock(&dev_pm_qos_sysfs_mtx); mutex_unlock(&dev_pm_qos_sysfs_mtx);
} }
static bool dev_pm_qos_invalid_request(struct device *dev, static bool dev_pm_qos_invalid_req_type(struct device *dev,
struct dev_pm_qos_request *req) enum dev_pm_qos_req_type type)
{ {
return !req || (req->type == DEV_PM_QOS_LATENCY_TOLERANCE return type == DEV_PM_QOS_LATENCY_TOLERANCE &&
&& !dev->power.set_latency_tolerance); !dev->power.set_latency_tolerance;
} }
static int __dev_pm_qos_add_request(struct device *dev, static int __dev_pm_qos_add_request(struct device *dev,
@ -290,7 +290,7 @@ static int __dev_pm_qos_add_request(struct device *dev,
{ {
int ret = 0; int ret = 0;
if (!dev || dev_pm_qos_invalid_request(dev, req)) if (!dev || !req || dev_pm_qos_invalid_req_type(dev, type))
return -EINVAL; return -EINVAL;
if (WARN(dev_pm_qos_request_active(req), if (WARN(dev_pm_qos_request_active(req),