| From 85d100eb85ee65b3c954517cd546fd3350bd49f8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 7 Jun 2021 17:22:27 -0500 |
| Subject: ASoC: rt1308-sdw: use first_hw_init flag on resume |
| |
| From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| |
| [ Upstream commit 30e102dab5fad1db71684f8ac5e1ac74e49da06d ] |
| |
| The intent of the status check on resume was to verify if a SoundWire |
| peripheral reported ATTACHED before waiting for the initialization to |
| complete. This is required to avoid timeouts that will happen with |
| 'ghost' devices that are exposed in the platform firmware but are not |
| populated in hardware. |
| |
| Unfortunately we used 'hw_init' instead of 'first_hw_init'. Due to |
| another error, the resume operation never timed out, but the volume |
| settings were not properly restored. |
| |
| BugLink: https://github.com/thesofproject/linux/issues/2908 |
| BugLink: https://github.com/thesofproject/linux/issues/2637 |
| Fixes: a87a6653a28c0 ('ASoC: rt1308-sdw: add rt1308 SdW amplifier driver') |
| Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> |
| Reviewed-by: Bard Liao <bard.liao@intel.com> |
| Link: https://lore.kernel.org/r/20210607222239.582139-4-pierre-louis.bossart@linux.intel.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/codecs/rt1308-sdw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c |
| index c2621b0afe6c..31daa749c3db 100644 |
| --- a/sound/soc/codecs/rt1308-sdw.c |
| +++ b/sound/soc/codecs/rt1308-sdw.c |
| @@ -709,7 +709,7 @@ static int __maybe_unused rt1308_dev_resume(struct device *dev) |
| struct rt1308_sdw_priv *rt1308 = dev_get_drvdata(dev); |
| unsigned long time; |
| |
| - if (!rt1308->hw_init) |
| + if (!rt1308->first_hw_init) |
| return 0; |
| |
| if (!slave->unattach_request) |
| -- |
| 2.30.2 |
| |
