evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: wsa881x: Update device state during device probe"

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-24 02:00:40 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5487004966
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/codecs/wsa881x.c
View file

@ -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;