diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-05 18:33:22 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-05 18:33:22 -0500 |
| commit | 868b093505d6378df77bc2bb656af082330127a8 (patch) | |
| tree | 58a022cbe3a57325e781d13c4c1c8347a34f7daa | |
| parent | f3ea36aa87400baafd17d548a873de5fe1ecdfcd (diff) | |
| parent | 4ce4780270b69a0f4ce81887c2ef864c04cb7f9f (diff) | |
Merge branch 'pm-qos'
* pm-qos:
PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
| -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 ff46387f530..d21349544ce 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c | |||
| @@ -542,19 +542,19 @@ int dev_pm_qos_add_ancestor_request(struct device *dev, | |||
| 542 | struct dev_pm_qos_request *req, s32 value) | 542 | struct dev_pm_qos_request *req, s32 value) |
| 543 | { | 543 | { |
| 544 | struct device *ancestor = dev->parent; | 544 | struct device *ancestor = dev->parent; |
| 545 | int error = -ENODEV; | 545 | int ret = -ENODEV; |
| 546 | 546 | ||
| 547 | while (ancestor && !ancestor->power.ignore_children) | 547 | while (ancestor && !ancestor->power.ignore_children) |
| 548 | ancestor = ancestor->parent; | 548 | ancestor = ancestor->parent; |
| 549 | 549 | ||
| 550 | if (ancestor) | 550 | if (ancestor) |
| 551 | error = dev_pm_qos_add_request(ancestor, req, | 551 | ret = dev_pm_qos_add_request(ancestor, req, |
| 552 | DEV_PM_QOS_LATENCY, value); | 552 | DEV_PM_QOS_LATENCY, value); |
| 553 | 553 | ||
| 554 | if (error < 0) | 554 | if (ret < 0) |
| 555 | req->dev = NULL; | 555 | req->dev = NULL; |
| 556 | 556 | ||
| 557 | return error; | 557 | return ret; |
| 558 | } | 558 | } |
| 559 | EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request); | 559 | EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request); |
| 560 | 560 | ||