Merge branch 'pm-qos'
* pm-qos: PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
This commit is contained in:
commit
868b093505
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue