From 145d79af2d9bd27575abe6c104d4e575e279952a Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 24 Feb 2013 10:48:46 +0000 Subject: [PATCH] --- yaml --- r: 372139 b: refs/heads/master c: f863440d54fccbcd0ef0f6d96d81521e0fa41e35 h: refs/heads/master i: 372137: c9a32e58d8cd1d0891d7484e6fb3ce557939a9a5 372135: eb51154dbe643f2976c3bdb2e1b41059a9ac2c67 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/board-harmony-pcie.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aa2015ccbf0d..34fa8cb1d868 100644 --- 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 index 3cdc1bb8254c..6d29e6a39540 100644 --- 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; }