summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMagnus Templing <magnus.templing@stericsson.com>2011-11-17 11:47:39 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:05:01 +0200
commitc60d5338e86549dd47e6fa951434f5c62e4375fb (patch)
tree68a699899ef2cd0feab4ca4bdf686fbcc379a1a7 /sound
parentdd17205c3c2d6cd096925e46f04a124951d6ba49 (diff)
Ux500 ASoC: Only turn off regulator on error
ST-Ericsson ID: 373275 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I671122a26da1a0cf3c69f0fb2c48a4365464ecfb Signed-off-by: Magnus Templing <magnus.templing@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/38150 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: QATOOLS Tested-by: Tobias ANDERSON <tobias.xx.andersson@stericsson.com> Reviewed-by: QABUILD
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/ux500/ux500_ab8500.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/ux500/ux500_ab8500.c b/sound/soc/ux500/ux500_ab8500.c
index f9234c6c721..2eef499d22e 100644
--- a/sound/soc/ux500/ux500_ab8500.c
+++ b/sound/soc/ux500/ux500_ab8500.c
@@ -219,6 +219,8 @@ static int ux500_ab8500_power_control_inc(void)
ab8500_audio_power_control(true);
}
+ goto out;
+
clk_err:
disable_regulator(REGULATOR_AUDIO);