From 783d038b170e045da1ccda670e270dbf3629535f Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jhnikula@gmail.com>
Date: Mon, 8 Nov 2010 10:57:57 +0200
Subject: [PATCH] --- yaml --- r: 230279 b: refs/heads/master c:
 0656f6cf6c394ede78657595dd5a8ca7a1e64853 h: refs/heads/master i:   230277:
 063d047d3a856bfb74243230f06c59422ebedeef   230275:
 4459682705404ebf32fa82225568c3c1ffe3c6d8   230271:
 17a42a595ca676dfbbe78d09398051325a33f635 v: v3

---
 [refs]                             | 2 +-
 trunk/sound/soc/codecs/tpa6130a2.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d244038db1c0..5f7b3dc52f96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 414c73abfd0e565950f3b02336cf516147f0e104
+refs/heads/master: 0656f6cf6c394ede78657595dd5a8ca7a1e64853
diff --git a/trunk/sound/soc/codecs/tpa6130a2.c b/trunk/sound/soc/codecs/tpa6130a2.c
index 329acc1a2074..e55317b35786 100644
--- a/trunk/sound/soc/codecs/tpa6130a2.c
+++ b/trunk/sound/soc/codecs/tpa6130a2.c
@@ -126,9 +126,6 @@ static int tpa6130a2_power(int power)
 
 	mutex_lock(&data->mutex);
 	if (power) {
-		/* 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();