diff options
Diffstat (limited to 'drivers/base/power/qos.c')
-rw-r--r-- | drivers/base/power/qos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index f850daeffba4..277d43a83f53 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c | |||
@@ -277,11 +277,11 @@ void dev_pm_qos_constraints_destroy(struct device *dev) | |||
277 | mutex_unlock(&dev_pm_qos_sysfs_mtx); | 277 | mutex_unlock(&dev_pm_qos_sysfs_mtx); |
278 | } | 278 | } |
279 | 279 | ||
280 | static bool dev_pm_qos_invalid_request(struct device *dev, | 280 | static bool dev_pm_qos_invalid_req_type(struct device *dev, |
281 | struct dev_pm_qos_request *req) | 281 | enum dev_pm_qos_req_type type) |
282 | { | 282 | { |
283 | return !req || (req->type == DEV_PM_QOS_LATENCY_TOLERANCE | 283 | return type == DEV_PM_QOS_LATENCY_TOLERANCE && |
284 | && !dev->power.set_latency_tolerance); | 284 | !dev->power.set_latency_tolerance; |
285 | } | 285 | } |
286 | 286 | ||
287 | static int __dev_pm_qos_add_request(struct device *dev, | 287 | static int __dev_pm_qos_add_request(struct device *dev, |
@@ -290,7 +290,7 @@ static int __dev_pm_qos_add_request(struct device *dev, | |||
290 | { | 290 | { |
291 | int ret = 0; | 291 | int ret = 0; |
292 | 292 | ||
293 | if (!dev || dev_pm_qos_invalid_request(dev, req)) | 293 | if (!dev || !req || dev_pm_qos_invalid_req_type(dev, type)) |
294 | return -EINVAL; | 294 | return -EINVAL; |
295 | 295 | ||
296 | if (WARN(dev_pm_qos_request_active(req), | 296 | if (WARN(dev_pm_qos_request_active(req), |