dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'pm-qos' 

* pm-qos:
  PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
This commit is contained in:
Rafael J. Wysocki 2013-01-06 00:33:22 +01:00
parent f3ea36aa87 4ce4780270
commit 868b093505
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

@ -542,19 +542,19 @@ int dev_pm_qos_add_ancestor_request(struct device *dev,
struct dev_pm_qos_request *req, s32 value)
{
struct device *ancestor = dev->parent;
int error = -ENODEV;
int ret = -ENODEV;
while (ancestor && !ancestor->power.ignore_children)
ancestor = ancestor->parent;
if (ancestor)
error = dev_pm_qos_add_request(ancestor, req,
DEV_PM_QOS_LATENCY, value);
ret = dev_pm_qos_add_request(ancestor, req,
DEV_PM_QOS_LATENCY, value);
if (error < 0)
if (ret < 0)
req->dev = NULL;
return error;
return ret;
}
EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request);