summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/tpa6130a2.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-24 11:26:39 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-24 11:26:39 +0000
commita1c1f770e3653bfcd5dd664d8471f70d220e19f3 (patch)
treefdf3001d6608d8d8c715da7ea84c0d32fc33a9a7 /sound/soc/codecs/tpa6130a2.c
parentd50a87402e29e16a63152be810d9723ce4d87e37 (diff)
parent2ab46c9390e74368a38ddb5aa525124518df8b69 (diff)
downloadlinux-a1c1f770e3653bfcd5dd664d8471f70d220e19f3.tar.bz2
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/tpa6130a2.c')
-rw-r--r--sound/soc/codecs/tpa6130a2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 2d64502c0c5b..9d61a1d6fce0 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -127,9 +127,6 @@ static int tpa6130a2_power(int power)
mutex_lock(&data->mutex);
if (power && !data->power_state) {
- /* Power on */
- if (data->power_gpio >= 0)
- gpio_set_value(data->power_gpio, 1);
ret = regulator_enable(data->supply);
if (ret != 0) {
@@ -137,6 +134,9 @@ static int tpa6130a2_power(int power)
"Failed to enable supply: %d\n", ret);
goto exit;
}
+ /* Power on */
+ if (data->power_gpio >= 0)
+ gpio_set_value(data->power_gpio, 1);
data->power_state = 1;
ret = tpa6130a2_initialize();