未验证 提交 0df73e1a 编写于 作者: S Srinivas Kandagatla 提交者: Mark Brown

ASoC: codecs: wsa883x: handle timeouts in resume path

Currently we do not check if SoundWire slave initialization timeout
expired before continuing to access its registers.

Its possible that the registers are not accessible if timeout is
expired. Handle this by returning timeout in resume path.
Reported-by: NPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fixes: 43b8c7dc ("ASoC: codecs: add wsa883x amplifier support")
Signed-off-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220630130023.9308-2-srinivas.kandagatla@linaro.orgSigned-off-by: NMark Brown <broonie@kernel.org>
上级 cf6af24b
......@@ -1455,6 +1455,7 @@ static int __maybe_unused wsa883x_runtime_resume(struct device *dev)
struct sdw_slave *slave = dev_to_sdw_dev(dev);
struct regmap *regmap = dev_get_regmap(dev, NULL);
struct wsa883x_priv *wsa883x = dev_get_drvdata(dev);
unsigned long time;
int ret;
ret = regulator_enable(wsa883x->vdd);
......@@ -1465,8 +1466,14 @@ static int __maybe_unused wsa883x_runtime_resume(struct device *dev)
gpiod_direction_output(wsa883x->sd_n, 1);
wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(WSA883X_PROBE_TIMEOUT));
time = wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(WSA883X_PROBE_TIMEOUT));
if (!time) {
dev_err(dev, "Initialization not complete, timed out\n");
gpiod_direction_output(wsa883x->sd_n, 0);
regulator_disable(wsa883x->vdd);
return -ETIMEDOUT;
}
usleep_range(20000, 20010);
regcache_cache_only(regmap, false);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册