This is a note to let you know that I've just added the patch titled
ASoC: rt5682: Fix a problem with error handling in the io init function of the soundwire
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-rt5682-fix-a-problem-with-error-handling-in-the-io-init-function-of-the-soundwire.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9266d95405ae0c078f188ec8bca3a004631be429 Mon Sep 17 00:00:00 2001
From: Oder Chiou <oder_chiou@xxxxxxxxxxx>
Date: Mon, 7 Jun 2021 17:22:36 -0500
Subject: ASoC: rt5682: Fix a problem with error handling in the io init function of the soundwire
From: Oder Chiou <oder_chiou@xxxxxxxxxxx>
commit 9266d95405ae0c078f188ec8bca3a004631be429 upstream.
The device checking error should be a jump to pm_runtime_put_autosuspend()
as done before returning value.
Fixes: 867f8d18df4f ('ASoC: rt5682: fix getting the wrong device id when the suspend_stress_test')
Reviewed-by: Bard Liao <bard.liao@xxxxxxxxx>
Signed-off-by: Oder Chiou <oder_chiou@xxxxxxxxxxx>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210607222239.582139-13-pierre-louis.bossart@xxxxxxxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/codecs/rt5682-sdw.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/rt5682-sdw.c
+++ b/sound/soc/codecs/rt5682-sdw.c
@@ -413,9 +413,11 @@ static int rt5682_io_init(struct device
usleep_range(30000, 30005);
loop--;
}
+
if (val != DEVICE_ID) {
dev_err(dev, "Device with ID register %x is not rt5682\n", val);
- return -ENODEV;
+ ret = -ENODEV;
+ goto err_nodev;
}
rt5682_calibrate(rt5682);
@@ -486,10 +488,11 @@ reinit:
rt5682->hw_init = true;
rt5682->first_hw_init = true;
+err_nodev:
pm_runtime_mark_last_busy(&slave->dev);
pm_runtime_put_autosuspend(&slave->dev);
- dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
+ dev_dbg(&slave->dev, "%s hw_init complete: %d\n", __func__, ret);
return ret;
}
Patches currently in stable-queue which might be from oder_chiou@xxxxxxxxxxx are
queue-5.10/asoc-rt5682-fix-a-problem-with-error-handling-in-the-io-init-function-of-the-soundwire.patch
