ASoC: Intel: sof_sdw_rt_sdca_jack_common: test SOF_JACK_JDSRC in _exit
authorBard Liao <yung-chuan.liao@linux.intel.com>
Fri, 2 Jun 2023 20:22:04 +0000 (15:22 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 5 Jun 2023 13:00:14 +0000 (14:00 +0100)
if (!SOF_RT711_JDSRC(sof_sdw_quirk)) is tested in rt711_sdca_add_codec_
device_props(), and we don't add software node to the device if jack
source is not set. We need to do the same test in
sof_sdw_rt711_sdca_exit(), and avoid removing software node if jack
source is not set.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230602202225.249209-8-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_sdw_rt711_sdca.c

index 7f16304..cf8b979 100644 (file)
@@ -143,6 +143,9 @@ int sof_sdw_rt711_sdca_exit(struct snd_soc_card *card, struct snd_soc_dai_link *
        if (!ctx->headset_codec_dev)
                return 0;
 
+       if (!SOF_RT711_JDSRC(sof_sdw_quirk))
+               return 0;
+
        device_remove_software_node(ctx->headset_codec_dev);
        put_device(ctx->headset_codec_dev);