diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:02:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:02:45 +0000 |
| commit | 5b94e1816703c1f06646501c2474835416c35580 (patch) | |
| tree | 56bada0b7eec657c8ea966573eb28d75eba9e6ed /drivers/base | |
| parent | 80da549e5225c6f80d45f76ba2b3a4574ed278ae (diff) | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| download | blackbird-op-linux-5b94e1816703c1f06646501c2474835416c35580.tar.gz blackbird-op-linux-5b94e1816703c1f06646501c2474835416c35580.zip | |
Merge tag 'v3.7-rc7' into asoc-wm2200
Linux 3.7-rc7
Diffstat (limited to 'drivers/base')
| -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; |
