diff options
author | Axel Lin <axel.lin@ingics.com> | 2013-04-11 12:05:43 +0800 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-11 17:43:56 +0100 |
commit | 42e8c811bab682121cb57d58e9a37d8cb38e51ca (patch) | |
tree | 2bcbf9bcc82ade1dd3efe340347105d6fef3348e /drivers/regulator/ab8500.c | |
parent | 3480c0cab6e1a25fdeb63147b0b643b7825a36fb (diff) | |
download | op-kernel-dev-42e8c811bab682121cb57d58e9a37d8cb38e51ca.zip op-kernel-dev-42e8c811bab682121cb57d58e9a37d8cb38e51ca.tar.gz |
regulator: ab8500: Unregister ab8500-ext regulators in probe() failure path
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r-- | drivers/regulator/ab8500.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index c200f8b..ea182d3 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -3172,8 +3172,11 @@ static int ab8500_regulator_probe(struct platform_device *pdev) for (i = 0; i < abx500_regulator.info_size; i++) { err = ab8500_regulator_register(pdev, &pdata->regulator[i], i, NULL); - if (err < 0) + if (err < 0) { + if (!is_ab8505(ab8500)) + ab8500_ext_regulator_exit(pdev); return err; + } } return 0; |