Commit 0df73e1a authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by 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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fixes: 43b8c7dc ("ASoC: codecs: add wsa883x amplifier support")
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220630130023.9308-2-srinivas.kandagatla@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent cf6af24b
...@@ -1455,6 +1455,7 @@ static int __maybe_unused wsa883x_runtime_resume(struct device *dev) ...@@ -1455,6 +1455,7 @@ static int __maybe_unused wsa883x_runtime_resume(struct device *dev)
struct sdw_slave *slave = dev_to_sdw_dev(dev); struct sdw_slave *slave = dev_to_sdw_dev(dev);
struct regmap *regmap = dev_get_regmap(dev, NULL); struct regmap *regmap = dev_get_regmap(dev, NULL);
struct wsa883x_priv *wsa883x = dev_get_drvdata(dev); struct wsa883x_priv *wsa883x = dev_get_drvdata(dev);
unsigned long time;
int ret; int ret;
ret = regulator_enable(wsa883x->vdd); ret = regulator_enable(wsa883x->vdd);
...@@ -1465,8 +1466,14 @@ static int __maybe_unused wsa883x_runtime_resume(struct device *dev) ...@@ -1465,8 +1466,14 @@ static int __maybe_unused wsa883x_runtime_resume(struct device *dev)
gpiod_direction_output(wsa883x->sd_n, 1); gpiod_direction_output(wsa883x->sd_n, 1);
wait_for_completion_timeout(&slave->initialization_complete, time = wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(WSA883X_PROBE_TIMEOUT)); 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); usleep_range(20000, 20010);
regcache_cache_only(regmap, false); regcache_cache_only(regmap, false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment