summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/tpa6130a2.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-11-23 14:45:05 +0300
committerTakashi Iwai <tiwai@suse.de>2010-11-23 14:45:05 +0300
commit2ab46c9390e74368a38ddb5aa525124518df8b69 (patch)
tree631e686fb11709add69f07b4fd1e5aaa10f232de /sound/soc/codecs/tpa6130a2.c
parent9e18e1869f5ebac69f0d881fe97a198ebc0834db (diff)
parent5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d (diff)
downloadlinux-2ab46c9390e74368a38ddb5aa525124518df8b69.tar.xz
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Conflicts: sound/soc/codecs/tpa6130a2.c
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 f9a92ea6b50a..d69d2f5f9570 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -126,9 +126,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) {
@@ -136,6 +133,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();