From b48386d43c2a22ec3942cff1cfc3651b60a9bb28 Mon Sep 17 00:00:00 2001 From: Jonghwan Choi Date: Tue, 26 Jul 2011 16:08:16 -0700 Subject: [PATCH] --- yaml --- r: 260391 b: refs/heads/master c: fc92805a8e25e5e2b0ba7c413cc15d9f05962ee8 h: refs/heads/master i: 260389: 71e0d86c515a423a6b57d9678778e3d9eef7d3b7 260387: d506d661aded65f7ccf3812a55145df4ce4cf894 260383: 5617fb1c54841f3376047dbfed094670a41b1516 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 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;