Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54870049 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 090cd1c9 85a1f2a8

sound/soc/codecs/wsa881x.c

+1 −1
Original line number Diff line number Diff line
@@ -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;