diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-06 00:33:22 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-06 00:33:22 +0100 |
| commit | 868b093505d6378df77bc2bb656af082330127a8 (patch) | |
| tree | 58a022cbe3a57325e781d13c4c1c8347a34f7daa /drivers | |
| parent | f3ea36aa87400baafd17d548a873de5fe1ecdfcd (diff) | |
| parent | 4ce4780270b69a0f4ce81887c2ef864c04cb7f9f (diff) | |
| download | linux-868b093505d6378df77bc2bb656af082330127a8.tar.gz | |
Merge branch 'pm-qos'
* pm-qos: PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
Diffstat (limited to 'drivers')
| -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 ff46387f5308..d21349544ce5 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, 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); |