summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-23 12:16:43 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-23 12:16:43 -1000
commita0543d64388146f83ff7aef4abb42f8fd074d5e0 (patch)
tree003effd8c59076f18262f44592eff1eca1859e6f
parent1d838d70fb867b155ee380b37d556893a7313ed2 (diff)
parenta7227a0faa117d0bc532aea546ae5ac5f89e8ed7 (diff)
downloadconfigs-a0543d64388146f83ff7aef4abb42f8fd074d5e0.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 74a67e0019a..fbbd4ed2edf 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;