From 65ea6318acdacb0a655418ca00494db00f2bc3e6 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 27 Sep 2012 13:54:36 +0800
Subject: [PATCH] --- yaml --- r: 333339 b: refs/heads/master c:
 93b44bea0c17130e62d8b1b82c0e2a0d671230d1 h: refs/heads/master i:   333337:
 61dca8dcf064368ccf19175c79649a18b024e971   333335:
 779d0eda968e552e3b81d41d3a94c493a7b98394 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-omap2/pm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e4784ffe50f0..e60b96c3e3ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07684c1b582ddd991c908f3de26e823b977d0a75
+refs/heads/master: 93b44bea0c17130e62d8b1b82c0e2a0d671230d1
diff --git a/trunk/arch/arm/mach-omap2/pm.c b/trunk/arch/arm/mach-omap2/pm.c
index 9cb5cede0f50..ab15e5c1bba5 100644
--- a/trunk/arch/arm/mach-omap2/pm.c
+++ b/trunk/arch/arm/mach-omap2/pm.c
@@ -176,7 +176,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,
 	}
 
 	voltdm = voltdm_lookup(vdd_name);
-	if (IS_ERR(voltdm)) {
+	if (!voltdm) {
 		pr_err("%s: unable to get vdd pointer for vdd_%s\n",
 			__func__, vdd_name);
 		goto exit;