diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 12:16:43 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 12:16:43 -1000 |
| commit | a0543d64388146f83ff7aef4abb42f8fd074d5e0 (patch) | |
| tree | 003effd8c59076f18262f44592eff1eca1859e6f | |
| parent | Merge tag 'md-3.7-fixes' of git://neil.brown.name/md (diff) | |
| parent | PM / QoS: fix wrong error-checking condition (diff) | |
| download | linux-dev-a0543d64388146f83ff7aef4abb42f8fd074d5e0.tar.xz linux-dev-a0543d64388146f83ff7aef4abb42f8fd074d5e0.zip | |
Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management update from Rafael Wysocki:
"Fix for an incorrect error condition check in device PM QoS code that
may lead to an Oops from Guennadi Liakhovetski."
* tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / QoS: fix wrong error-checking condition
| -rw-r--r-- | drivers/base/power/qos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index 74a67e0019a2..fbbd4ed2edf2 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -451,7 +451,7 @@ int dev_pm_qos_add_ancestor_request(struct device *dev, if (ancestor) error = dev_pm_qos_add_request(ancestor, req, value); - if (error) + if (error < 0) req->dev = NULL; return error; |