diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-29 12:45:12 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-29 18:35:17 -0500 |
commit | 1dd4c8e42aa08f21de3cdb4f7aa0841fbd7e3f58 (patch) | |
tree | 0252a59457fdc732c21e2e135c3c6357e1009b84 /sound/soc/codecs/wm8996.c | |
parent | b9e67e5ef3c14453e10f41468b6e601d37291a82 (diff) |
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/wm8996.c')
-rw-r--r-- | sound/soc/codecs/wm8996.c | 2 |
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) | |||
1719 | static int wm8996_reset(struct wm8996_priv *wm8996) | 1719 | static int wm8996_reset(struct wm8996_priv *wm8996) |
1720 | { | 1720 | { |
1721 | if (wm8996->pdata.ldo_ena > 0) { | 1721 | if (wm8996->pdata.ldo_ena > 0) { |
1722 | gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 1); | ||
1723 | gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); | 1722 | gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); |
1723 | gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 1); | ||
1724 | return 0; | 1724 | return 0; |
1725 | } else { | 1725 | } else { |
1726 | return regmap_write(wm8996->regmap, WM8996_SOFTWARE_RESET, | 1726 | return regmap_write(wm8996->regmap, WM8996_SOFTWARE_RESET, |