Unverified Commit 6f492568 authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

ASoC: codecs: wcd938x: fix soundwire initialisation race 



Make sure that the soundwire device used for register accesses has been
enumerated and initialised before trying to read the codec variant
during component probe.

This specifically avoids interpreting (a masked and shifted) -EBUSY
errno as the variant:

	wcd938x_codec audio-codec: ASoC: error at soc_component_read_no_lock on audio-codec for register: [0x000034b0] -16

in case the soundwire device has not yet been initialised, which in turn
prevents some headphone controls from being registered.

Fixes: 8d78602a ("ASoC: codecs: wcd938x: add basic driver")
Cc: stable@vger.kernel.org	# 5.14
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reported-by: default avatarSteev Klimaszewski <steev@kali.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Tested-by: default avatarSteev Klimaszewski <steev@kali.org>
Link: https://lore.kernel.org/r/20230701094723.29379-1-johan+linaro@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 055509cd

sound/soc/codecs/wcd938x.c

+9 −0
Original line number Diff line number Diff line
@@ -3081,9 +3081,18 @@ static int wcd938x_irq_init(struct wcd938x_priv *wcd, struct device *dev) 
static int wcd938x_soc_codec_probe(struct snd_soc_component *component)

{

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);

	struct sdw_slave *tx_sdw_dev = wcd938x->tx_sdw_dev;

	struct device *dev = component->dev;

	unsigned long time_left;

	int ret, i;



	time_left = wait_for_completion_timeout(&tx_sdw_dev->initialization_complete,

						msecs_to_jiffies(2000));

	if (!time_left) {

		dev_err(dev, "soundwire device init timeout\n");

		return -ETIMEDOUT;

	}



	snd_soc_component_init_regmap(component, wcd938x->regmap);



	ret = pm_runtime_resume_and_get(dev);