ASoC: rt5645: fix kernel hang when call rt5645_set_jack_detect() (345b0f50) · Commits · 戴 / test

rt5645_set_jack_detect() is usually called from snd_soc_dai_link.init() and it calls snd_soc_jack_report() from rt5645_irq_detection() if jack is inserted. snd_soc_jack_report() results in kernel hang if it is called from a context which cannot sleep. This patch makes sure snd_soc_jack_report() is called from workqueue. It can fix the kernel hang issue. Signed-off-by:

John Lin <john.lin@realtek.com> Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/codecs/rt5645.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2876,6 +2876,7 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)
		}

		static int rt5645_irq_detection(struct rt5645_priv *rt5645);
		static irqreturn_t rt5645_irq(int irq, void *data);

		int rt5645_set_jack_detect(struct snd_soc_codec *codec,
		struct snd_soc_jack hp_jack, struct snd_soc_jack mic_jack,
		@@ -2895,7 +2896,7 @@ int rt5645_set_jack_detect(struct snd_soc_codec *codec,
		regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1,
		RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL);
		}
		rt5645_irq_detection(rt5645);
		rt5645_irq(0, rt5645);

		return 0;
		}

Admin message