projects/linux·commit a0543d64

Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

a0543d64 · Linus Torvalds <[email protected]> · 2012-11-23 12:16:43 -10:00

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
Commit
a0543d64388146f83ff7aef4abb42f8fd074d5e0
Parents
1d838d70 · a7227a0f

Merge commit. Changes below are compared with the first parent: 1d838d70.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/base/power/qos.cmodified+1−1View file

drivers/base/power/qos.c

View file
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 74a67e0..fbbd4ed 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;