ASoC: rt700-sdw: use first_hw_init flag on resume
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Mon, 7 Jun 2021 22:22:30 +0000 (17:22 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 8 Jun 2021 12:36:32 +0000 (13:36 +0100)
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: 7d2a5f9ae41e3 ('ASoC: rt700: add rt700 codec 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-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt700-sdw.c

index ff9c081fd52af53ad226d1b0d6084df09a2aeedd..d1d9c0f455b437fbec94d5b878eddb651f39e34a 100644 (file)
@@ -498,7 +498,7 @@ static int __maybe_unused rt700_dev_resume(struct device *dev)
        struct rt700_priv *rt700 = dev_get_drvdata(dev);
        unsigned long time;
 
-       if (!rt700->hw_init)
+       if (!rt700->first_hw_init)
                return 0;
 
        if (!slave->unattach_request)