diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 12:26:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 12:26:39 +0100 |
| commit | a1c1f770e3653bfcd5dd664d8471f70d220e19f3 (patch) | |
| tree | fdf3001d6608d8d8c715da7ea84c0d32fc33a9a7 /sound/soc/codecs/tpa6130a2.c | |
| parent | Merge branch 'for-2.6.37' into for-2.6.38 (diff) | |
| parent | Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff) | |
| download | linux-a1c1f770e3653bfcd5dd664d8471f70d220e19f3.tar.xz linux-a1c1f770e3653bfcd5dd664d8471f70d220e19f3.zip | |
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.c | 6 |
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(); |