Patchwork ARM: tegra: fix ignored return value of regulator_enable

login
register
mail settings
Submitter Stephen Warren
Date March 7, 2013, 12:16 a.m.
Message ID <1362615385-13418-1-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/225688/
State New
Headers show

Comments

Stephen Warren - March 7, 2013, 12:16 a.m.
From: Stephen Warren <swarren@nvidia.com>

This fixes:

arch/arm/mach-tegra/board-harmony-pcie.c: In function ‘harmony_pcie_init’:
arch/arm/mach-tegra/board-harmony-pcie.c:65:18: warning: ignoring return
    value of ‘regulator_enable’, declared with attribute
    warn_unused_result [-Wunused-result]

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/mach-tegra/board-harmony-pcie.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Stephen Warren - March 7, 2013, 8:31 p.m.
On 03/06/2013 05:16 PM, Stephen Warren wrote:
> This fixes:
> 
> arch/arm/mach-tegra/board-harmony-pcie.c: In function ‘harmony_pcie_init’:
> arch/arm/mach-tegra/board-harmony-pcie.c:65:18: warning: ignoring return
>     value of ‘regulator_enable’, declared with attribute
>     warn_unused_result [-Wunused-result]

I've applied this to Tegra's for-3.10/fixes branch.

Patch

diff --git a/arch/arm/mach-tegra/board-harmony-pcie.c b/arch/arm/mach-tegra/board-harmony-pcie.c
index 3cdc1bb..d195db0 100644
--- a/arch/arm/mach-tegra/board-harmony-pcie.c
+++ b/arch/arm/mach-tegra/board-harmony-pcie.c
@@ -62,7 +62,11 @@  int __init harmony_pcie_init(void)
 		goto err_reg;
 	}
 
-	regulator_enable(regulator);
+	err = regulator_enable(regulator);
+	if (err) {
+		pr_err("%s: regulator_enable failed: %d\n", __func__, err);
+		goto err_en;
+	}
 
 	err = tegra_pcie_init(true, true);
 	if (err) {
@@ -74,6 +78,7 @@  int __init harmony_pcie_init(void)
 
 err_pcie:
 	regulator_disable(regulator);
+err_en:
 	regulator_put(regulator);
 err_reg:
 	gpio_free(en_vdd_1v05);