summary refs log tree commit diff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-29 17:45:12 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-29 23:35:17 +0000
commit1dd4c8e42aa08f21de3cdb4f7aa0841fbd7e3f58 (patch)
tree0252a59457fdc732c21e2e135c3c6357e1009b84 /sound/soc/codecs
parentb9e67e5ef3c14453e10f41468b6e601d37291a82 (diff)
downloadlinux-1dd4c8e42aa08f21de3cdb4f7aa0841fbd7e3f58.tar.gz
ASoC: wm8996: Fix /RESET bounce ordering
We want to leave the device out of rather than in reset.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8996.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index fb5c07a9ec9c..1226f92bbb03 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -1719,8 +1719,8 @@ static bool wm8996_volatile_register(struct device *dev, unsigned int reg)
 static int wm8996_reset(struct wm8996_priv *wm8996)
 {
 	if (wm8996->pdata.ldo_ena > 0) {
-		gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 1);
 		gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0);
+		gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 1);
 		return 0;
 	} else {
 		return regmap_write(wm8996->regmap, WM8996_SOFTWARE_RESET,