git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
drivers
/
base
/
power
/
opp.c
diff --git
a/drivers/base/power/opp.c
b/drivers/base/power/opp.c
index
434a6c0
..
95706fa
100644
(file)
--- 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;
}