diff --git a/[refs] b/[refs]
index 0b8d7b5c2ef7..41066bfe93c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adc400f69053b16756ff3b00daa64884c8df0787
+refs/heads/master: fc92805a8e25e5e2b0ba7c413cc15d9f05962ee8
diff --git a/trunk/drivers/base/power/opp.c b/trunk/drivers/base/power/opp.c
index 5cc12322ef32..b23de185cb04 100644
--- a/trunk/drivers/base/power/opp.c
+++ b/trunk/drivers/base/power/opp.c
@@ -453,7 +453,7 @@ int opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
 static int opp_set_availability(struct device *dev, unsigned long freq,
 		bool availability_req)
 {
-	struct device_opp *tmp_dev_opp, *dev_opp = NULL;
+	struct device_opp *tmp_dev_opp, *dev_opp = ERR_PTR(-ENODEV);
 	struct opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV);
 	int r = 0;