Commit 868b0935 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
parents f3ea36aa 4ce47802
...@@ -542,19 +542,19 @@ int dev_pm_qos_add_ancestor_request(struct device *dev, ...@@ -542,19 +542,19 @@ int dev_pm_qos_add_ancestor_request(struct device *dev,
struct dev_pm_qos_request *req, s32 value) struct dev_pm_qos_request *req, s32 value)
{ {
struct device *ancestor = dev->parent; struct device *ancestor = dev->parent;
int error = -ENODEV; int ret = -ENODEV;
while (ancestor && !ancestor->power.ignore_children) while (ancestor && !ancestor->power.ignore_children)
ancestor = ancestor->parent; ancestor = ancestor->parent;
if (ancestor) if (ancestor)
error = dev_pm_qos_add_request(ancestor, req, ret = dev_pm_qos_add_request(ancestor, req,
DEV_PM_QOS_LATENCY, value); DEV_PM_QOS_LATENCY, value);
if (error < 0) if (ret < 0)
req->dev = NULL; req->dev = NULL;
return error; return ret;
} }
EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request); EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment