forked from luck/tmp_suning_uos_patched
ASoC: rt5682-sdw: use first_hw_init flag on resume
[ Upstream commit 5361a42114689f875a9748299cadb4b1adbee6f4 ]
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: 03f6fc6de9
('ASoC: rt5682: Add the soundwire support')
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-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
16674ae3b2
commit
e1456cba8e
|
@ -734,7 +734,7 @@ static int __maybe_unused rt5682_dev_resume(struct device *dev)
|
|||
struct rt5682_priv *rt5682 = dev_get_drvdata(dev);
|
||||
unsigned long time;
|
||||
|
||||
if (!rt5682->hw_init)
|
||||
if (!rt5682->first_hw_init)
|
||||
return 0;
|
||||
|
||||
if (!slave->unattach_request)
|
||||
|
|
Loading…
Reference in New Issue
Block a user