Skip to content

Commit

Permalink
ASoC: Intel: sof_sdw_rt_sdca_jack_common: test SOF_JACK_JDSRC in _exit
Browse files Browse the repository at this point in the history
[ Upstream commit 526a187 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
bardliao authored and gregkh committed Aug 23, 2023
1 parent 31149bb commit c01ec45
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions sound/soc/intel/boards/sof_sdw_rt711_sdca.c
Expand Up @@ -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);

Expand Down

0 comments on commit c01ec45

Please sign in to comment.