summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudheer Papothi <spapothi@codeaurora.org>2016-09-21 00:18:42 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-23 11:11:25 -0700
commit85a1f2a812c6e26d68f0f44c7cdf9b53ada7bab0 (patch)
tree82094093866e05766bbe3efeaa330f0eaccd3319
parent9e2d528dc47d04e98c5e6f1c4ef84fc268115d36 (diff)
ASoC: wsa881x: Update device state during device probe
Device state is updated incorrectly during codec probe when the wsa881x soundwire slave device is in suspend state, resulting in register read/write failures. Update the device state during device probe instead of codec probe. Change-Id: I46afe2a08495c2ed06806b0568b1c44a6ffd947f Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
-rw-r--r--sound/soc/codecs/wsa881x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c
index b97b73dc4191..46a073bac2e9 100644
--- a/sound/soc/codecs/wsa881x.c
+++ b/sound/soc/codecs/wsa881x.c
@@ -1043,7 +1043,6 @@ static int wsa881x_probe(struct snd_soc_codec *codec)
"%s.%x", "wsatz", (u8)dev->addr);
wsa881x->bg_cnt = 0;
wsa881x->clk_cnt = 0;
- wsa881x->state = WSA881X_DEV_UP;
wsa881x->tz_pdata.codec = codec;
wsa881x->tz_pdata.wsa_temp_reg_read = wsa881x_temp_reg_read;
wsa881x_init_thermal(&wsa881x->tz_pdata);
@@ -1229,6 +1228,7 @@ static int wsa881x_swr_probe(struct swr_device *pdev)
goto err;
}
wsa881x_gpio_ctrl(wsa881x, true);
+ wsa881x->state = WSA881X_DEV_UP;
if (!debugfs_wsa881x_dent) {
dbgwsa881x = wsa881x;