diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2010-02-06 20:16:14 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-07 16:17:19 -0500 |
commit | 7731074ab21745cde00578148ce760df107eaf27 (patch) | |
tree | 3478c216eefd3511bee6fca1fff7b5eb7c67b308 /drivers/mfd | |
parent | e8343ddaccb322b1a2a989ac362cabd1e94597ad (diff) |
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/mfd')
-rw-r--r-- | 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 299c1af1334..844e1c1b7d9 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) | |||
305 | wm8994->supplies); | 305 | wm8994->supplies); |
306 | if (ret != 0) { | 306 | if (ret != 0) { |
307 | dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret); | 307 | dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret); |
308 | goto err_get; | 308 | goto err_supplies; |
309 | } | 309 | } |
310 | 310 | ||
311 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies), | 311 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies), |
312 | wm8994->supplies); | 312 | wm8994->supplies); |
313 | if (ret != 0) { | 313 | if (ret != 0) { |
314 | dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret); | 314 | dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret); |
315 | goto err_supplies; | 315 | goto err_get; |
316 | } | 316 | } |
317 | 317 | ||
318 | ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET); | 318 | ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET); |