diff options
| author |  Bard Liao <yung-chuan.liao@linux.intel.com>
| 2023-06-02 15:22:04 -0500 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2023-06-05 14:00:14 +0100 |
| commit | 526a1876fc48e2d0c0ea8ad63b58bdb2cc13047f (patch) | |
| tree | 0d7dbad74f25413fc3848b102d18efd0fe83cdb2 /sound/soc/intel | |
| parent | ASoC: Intel: sof_sdw: add multi dailink support for a codec (diff) | |
| download | linux-526a1876fc48e2d0c0ea8ad63b58bdb2cc13047f.tar.gz linux-526a1876fc48e2d0c0ea8ad63b58bdb2cc13047f.tar.bz2 linux-526a1876fc48e2d0c0ea8ad63b58bdb2cc13047f.zip | |
ASoC: Intel: sof_sdw_rt_sdca_jack_common: test SOF_JACK_JDSRC in _exit
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>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/sof_sdw_rt711_sdca.c b/sound/soc/intel/boards/sof_sdw_rt711_sdca.c index 7f16304d025b..cf8b9793fe0e 100644 --- a/sound/soc/intel/boards/sof_sdw_rt711_sdca.c +++ b/sound/soc/intel/boards/sof_sdw_rt711_sdca.c @@ -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); |