From de8654a85556f0e10cdd6406103ebeefe418829f Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 8 Nov 2011 22:34:00 +0100
Subject: [PATCH] --- yaml --- r: 275161 b: refs/heads/master c:
 156acb166ea9a43d7fcdf9b8051694ce4e91dbfc h: refs/heads/master i:   275159:
 7c3e3076cf95f5ed1c199fb24378511110516dd6 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/base/power/opp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 50095b7c589b..313ca112f93b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a51cfdc4516a6e1f2c1f8a579630a027c30331a
+refs/heads/master: 156acb166ea9a43d7fcdf9b8051694ce4e91dbfc
diff --git a/trunk/drivers/base/power/opp.c b/trunk/drivers/base/power/opp.c
index 434a6c011675..95706fa24c73 100644
--- a/trunk/drivers/base/power/opp.c
+++ b/trunk/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;
 }