diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 14:24:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 14:24:18 -0800 |
| commit | 3b7546211d53f600e15ca7867adbf3c085b8ecc9 (patch) | |
| tree | 9bd7f0eb414bad882d3e7f59e742ac1a21e804c5 /drivers | |
| parent | c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1 (diff) | |
| parent | 156acb166ea9a43d7fcdf9b8051694ce4e91dbfc (diff) | |
| download | linux-3b7546211d53f600e15ca7867adbf3c085b8ecc9.tar.gz | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())
PM / devfreq: fix private_data
Documentation: Fix typo in freezer-subsystem.txt
PM / QoS: Set cpu_dma_pm_qos->name
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/opp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 434a6c011675..95706fa24c73 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -669,7 +669,7 @@ struct srcu_notifier_head *opp_get_notifier(struct device *dev) struct device_opp *dev_opp = find_device_opp(dev); if (IS_ERR(dev_opp)) - return ERR_PTR(PTR_ERR(dev_opp)); /* matching type */ + return ERR_CAST(dev_opp); /* matching type */ return &dev_opp->head; } |