diff mbox series

ASoC: rt715-sdca-sdw: Fix wrong complete waiting in rt715_dev_resume()

Message ID 20240509163658.68062-1-pierre-louis.bossart@linux.intel.com
State New
Headers show
Series ASoC: rt715-sdca-sdw: Fix wrong complete waiting in rt715_dev_resume() | expand

Commit Message

Pierre-Louis Bossart May 9, 2024, 4:36 p.m. UTC 
From: Bard Liao <yung-chuan.liao@linux.intel.com>

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 20d17057f0a8 ("ASoC: rt715-sdca: Add RT715
sdca vendor-specific driver"), but the commit can only apply to
commit f892e66fcabc ("ASoC: rt-sdw*: add __func__ to all error logs").

Fixes: f892e66fcabc ("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>
---
 sound/soc/codecs/rt715-sdca-sdw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Mark Brown May 10, 2024, 9:41 a.m. UTC | #1 
On Thu, 09 May 2024 11:36:58 -0500, Pierre-Louis Bossart wrote:
> 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 20d17057f0a8 ("ASoC: rt715-sdca: Add RT715
> sdca vendor-specific driver"), but the commit can only apply to
> commit f892e66fcabc ("ASoC: rt-sdw*: add __func__ to all error logs").
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: rt715-sdca-sdw: Fix wrong complete waiting in rt715_dev_resume()
      commit: c8bdf9e727acb6e1b37febf422ef1751e5a2c7d1

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/codecs/rt715-sdca-sdw.c b/sound/soc/codecs/rt715-sdca-sdw.c
index d3fb02e8f31a..c8dabb9b16b5 100644
--- a/sound/soc/codecs/rt715-sdca-sdw.c
+++ b/sound/soc/codecs/rt715-sdca-sdw.c
@@ -234,10 +234,10 @@  static int __maybe_unused rt715_dev_resume(struct device *dev)
 	if (!slave->unattach_request)
 		goto regmap_sync;
 
-	time = wait_for_completion_timeout(&slave->enumeration_complete,
+	time = wait_for_completion_timeout(&slave->initialization_complete,
 					   msecs_to_jiffies(RT715_PROBE_TIMEOUT));
 	if (!time) {
-		dev_err(&slave->dev, "%s: Enumeration not complete, timed out\n", __func__);
+		dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
 		sdw_show_ping_status(slave->bus, true);
 
 		return -ETIMEDOUT;