From 4d7d336b8625ddb25a24ecefd10dbde922312c4e Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 29 Feb 2012 17:45:12 +0000 Subject: [PATCH] --- yaml --- r: 293423 b: refs/heads/master c: 1dd4c8e42aa08f21de3cdb4f7aa0841fbd7e3f58 h: refs/heads/master i: 293421: 52fb9d86572076551b7e65d6fea8f3951ae8f886 293419: 7776d1f7d89bbea728d51377fdd6f7ad7bd78abe 293415: 77b7185edc31152c88dd8f4225b735d268e6f978 293407: f54cd5fbb00be3880ac2651299f4f85ae024f23d v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8996.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 65eaa47b0c6d..cac92fae2db5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9e67e5ef3c14453e10f41468b6e601d37291a82 +refs/heads/master: 1dd4c8e42aa08f21de3cdb4f7aa0841fbd7e3f58 diff --git a/trunk/sound/soc/codecs/wm8996.c b/trunk/sound/soc/codecs/wm8996.c index fb5c07a9ec9c..1226f92bbb03 100644 --- a/trunk/sound/soc/codecs/wm8996.c +++ b/trunk/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,