diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 17:16:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 17:16:43 -0500 |
| commit | a0543d64388146f83ff7aef4abb42f8fd074d5e0 (patch) | |
| tree | 003effd8c59076f18262f44592eff1eca1859e6f /drivers | |
| parent | 1d838d70fb867b155ee380b37d556893a7313ed2 (diff) | |
| parent | a7227a0faa117d0bc532aea546ae5ac5f89e8ed7 (diff) | |
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
Diffstat (limited to 'drivers')
| -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, | |||
| 451 | if (ancestor) | 451 | if (ancestor) |
| 452 | error = dev_pm_qos_add_request(ancestor, req, value); | 452 | error = dev_pm_qos_add_request(ancestor, req, value); |
| 453 | 453 | ||
| 454 | if (error) | 454 | if (error < 0) |
| 455 | req->dev = NULL; | 455 | req->dev = NULL; |
| 456 | 456 | ||
| 457 | return error; | 457 | return error; |