diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-24 02:00:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-24 02:00:39 -0700 |
| commit | 548700496617566001ae8790d1c5b56c10df28e1 (patch) | |
| tree | 50678112030c2fd0ac2b6700349fcb5637065908 /sound | |
| parent | 090cd1c98acad44c97d5ab23c74842e2597576cb (diff) | |
| parent | 85a1f2a812c6e26d68f0f44c7cdf9b53ada7bab0 (diff) | |
Merge "ASoC: wsa881x: Update device state during device probe"
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wsa881x.c | 2 |
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; |