aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoonyoung Shim <jy0922.shim@samsung.com>2010-02-07 10:16:14 +0900
committerSamuel Ortiz <sameo@linux.intel.com>2010-03-07 22:17:19 +0100
commit7731074ab21745cde00578148ce760df107eaf27 (patch)
tree3478c216eefd3511bee6fca1fff7b5eb7c67b308 /drivers
parentmfd: Use i2c_dummy in 88pm860x (diff)
downloadlinux-dev-7731074ab21745cde00578148ce760df107eaf27.tar.xz
linux-dev-7731074ab21745cde00578148ce760df107eaf27.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/wm8994-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 299c1af1334e..844e1c1b7d90 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);