All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	tiwai@suse.de,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Fred Oh <fred.oh@linux.intel.com>,
	broonie@kernel.org,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH 5/5] ASoC: intel: cml_rt1011_rt5682: disable jack in dailink .exit()
Date: Mon, 22 Jun 2020 10:42:41 -0500	[thread overview]
Message-ID: <20200622154241.29053-6-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200622154241.29053-1-pierre-louis.bossart@linux.intel.com>

From: Fred Oh <fred.oh@linux.intel.com>

When removing the machine driver, the rt5682 jack handler will oops if jack
detection is not disabled. The jack can be disabled in the dai link's exit().

This is symmetrical change as jack is enabled in init().

Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c
index 68eff29daf8f..189c908c4aa8 100644
--- a/sound/soc/intel/boards/cml_rt1011_rt5682.c
+++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c
@@ -161,6 +161,13 @@ static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd)
 	return ret;
 };
 
+static void cml_rt5682_codec_exit(struct snd_soc_pcm_runtime *rtd)
+{
+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
+
+	snd_soc_component_set_jack(component, NULL, NULL);
+}
+
 static int cml_rt1011_spk_init(struct snd_soc_pcm_runtime *rtd)
 {
 	int ret = 0;
@@ -415,6 +422,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = {
 		.name = "SSP0-Codec",
 		.id = 0,
 		.init = cml_rt5682_codec_init,
+		.exit = cml_rt5682_codec_exit,
 		.ignore_pmdown_time = 1,
 		.ops = &cml_rt5682_ops,
 		.dpcm_playback = 1,
-- 
2.20.1


  parent reply	other threads:[~2020-06-22 15:46 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-22 15:42 [PATCH 0/5] ASoC: add dailink .exit() callback Pierre-Louis Bossart
2020-06-22 15:42 ` [PATCH 1/5] ASoC: soc-link: introduce exit() callback Pierre-Louis Bossart
2020-06-22 23:54   ` Kuninori Morimoto
2020-06-23 14:50     ` Pierre-Louis Bossart
2020-06-24 23:25       ` Kuninori Morimoto
2020-06-22 15:42 ` [PATCH 2/5] ASoC: Intel: bdw-rt5677: fix module load/unload issues Pierre-Louis Bossart
2020-06-22 18:18   ` Andy Shevchenko
2020-06-22 18:23     ` Pierre-Louis Bossart
2020-06-22 18:26       ` Mark Brown
2020-06-23  8:40         ` Andy Shevchenko
2020-06-23  9:37           ` Mark Brown
2020-06-23  8:43       ` Andy Shevchenko
2020-06-24 19:14   ` Cezary Rojewski
2020-06-24 20:06     ` Pierre-Louis Bossart
2020-06-24 20:26       ` Cezary Rojewski
2020-06-22 15:42 ` [PATCH 3/5] ASoC: Intel: kbl-rt5660: use .exit() dailink callback to release gpiod Pierre-Louis Bossart
2020-06-22 18:20   ` Andy Shevchenko
2020-06-22 18:26     ` Pierre-Louis Bossart
2020-06-23  8:39       ` Andy Shevchenko
2020-06-22 15:42 ` [PATCH 4/5] ASoC: intel: sof_rt5682: move disabling jack to dai link's exit() Pierre-Louis Bossart
2020-06-22 15:42 ` Pierre-Louis Bossart [this message]
2020-06-23 12:39 ` [PATCH 0/5] ASoC: add dailink .exit() callback Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200622154241.29053-6-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=fred.oh@linux.intel.com \
    --cc=guennadi.liakhovetski@linux.intel.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.