Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38

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();