Skip to content

Commit c8bdf9e

Browse files
bardliaobroonie
authored andcommitted
ASoC: rt715-sdca-sdw: Fix wrong complete waiting in rt715_dev_resume()
enumeration_complete will be completed when a peripheral is attached. And initialization_complete will be completed when a peripheral is initialized. rt715_dev_resume() should wait for initialization_complete instead of enumeration_complete. the issue exists since commit 20d1705 ("ASoC: rt715-sdca: Add RT715 sdca vendor-specific driver"), but the commit can only apply to commit f892e66 ("ASoC: rt-sdw*: add __func__ to all error logs"). Fixes: f892e66 ("ASoC: rt-sdw*: add __func__ to all error logs") Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20240509163658.68062-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent dd5cb1b commit c8bdf9e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/soc/codecs/rt715-sdca-sdw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ static int __maybe_unused rt715_dev_resume(struct device *dev)
234234
if (!slave->unattach_request)
235235
goto regmap_sync;
236236

237-
time = wait_for_completion_timeout(&slave->enumeration_complete,
237+
time = wait_for_completion_timeout(&slave->initialization_complete,
238238
msecs_to_jiffies(RT715_PROBE_TIMEOUT));
239239
if (!time) {
240-
dev_err(&slave->dev, "%s: Enumeration not complete, timed out\n", __func__);
240+
dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
241241
sdw_show_ping_status(slave->bus, true);
242242

243243
return -ETIMEDOUT;

0 commit comments

Comments
 (0)