mfd: Fix WM8994 error handling

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Sunday, March 7, 2010 - 6:04 pm

Gitweb:     http://git.kernel.org/linus/7731074ab21745cde00578148ce760df107eaf27
Commit:     7731074ab21745cde00578148ce760df107eaf27
Parent:     e8343ddaccb322b1a2a989ac362cabd1e94597ad
Author:     Joonyoung Shim <jy0922.shim@samsung.com>
AuthorDate: Sun Feb 7 10:16:14 2010 +0900
Committer:  Samuel Ortiz <sameo@linux.intel.com>
CommitDate: Sun Mar 7 22:17:19 2010 +0100

    mfd: Fix WM8994 error handling
    
    This patch fixes wrong goto statement for error handling on probe.
    
    Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
    Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---
 drivers/mfd/wm8994-core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 299c1af..844e1c1 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -305,14 +305,14 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
 				 wm8994->supplies);
 	if (ret != 0) {
 		dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
-		goto err_get;
+		goto err_supplies;
 	}
 
 	ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies),
 				    wm8994->supplies);
 	if (ret != 0) {
 		dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);
-		goto err_supplies;
+		goto err_get;
 	}
 
 	ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
mfd: Fix WM8994 error handling, Linux Kernel Mailing ..., (Sun Mar 7, 6:04 pm)