---

yaml --- r: 372139 b: refs/heads/master c: f863440 h: refs/heads/master i: 372137: c9a32e5 372135: eb51154 v: v3
git-mirror · Feb 24, 2013 · 145d79a · 145d79a
1 parent 20fa6bc
commit 145d79a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86287958bdc49e17dfe3dc8a5dd6234235d9c945
+refs/heads/master: f863440d54fccbcd0ef0f6d96d81521e0fa41e35
diff --git a/trunk/arch/arm/mach-tegra/board-harmony-pcie.c b/trunk/arch/arm/mach-tegra/board-harmony-pcie.c
@@ -56,9 +56,9 @@ int __init harmony_pcie_init(void)
 	gpio_direction_output(en_vdd_1v05, 1);
 
 	regulator = regulator_get(NULL, "vdd_ldo0,vddio_pex_clk");
-	if (IS_ERR_OR_NULL(regulator)) {
-		pr_err("%s: regulator_get failed: %d\n", __func__,
-		       (int)PTR_ERR(regulator));
+	if (IS_ERR(regulator)) {
+		err = PTR_ERR(regulator);
+		pr_err("%s: regulator_get failed: %d\n", __func__, err);
 		goto err_reg;
 	}