Skip to content

Commit 5cb90dc

Browse files
imtangmengbroonie
authored andcommitted
ASoC: fsl-asoc-card: Fix jack_event() always return 0
Today, hp_jack_event and mic_jack_event always return 0. However, snd_soc_dapm_disable_pin and snd_soc_dapm_enable_pin may return a non-zero value, this will cause the user who calling hp_jack_event and mic_jack_event don't know whether the operation was really successfully. Signed-off-by: Meng Tang <tangmeng@uniontech.com> Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> Link: https://lore.kernel.org/r/20220321065754.18307-1-tangmeng@uniontech.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent a7663c8 commit 5cb90dc

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

sound/soc/fsl/fsl-asoc-card.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,9 @@ static int hp_jack_event(struct notifier_block *nb, unsigned long event,
462462

463463
if (event & SND_JACK_HEADPHONE)
464464
/* Disable speaker if headphone is plugged in */
465-
snd_soc_dapm_disable_pin(dapm, "Ext Spk");
465+
return snd_soc_dapm_disable_pin(dapm, "Ext Spk");
466466
else
467-
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
468-
469-
return 0;
467+
return snd_soc_dapm_enable_pin(dapm, "Ext Spk");
470468
}
471469

472470
static struct notifier_block hp_jack_nb = {
@@ -481,11 +479,9 @@ static int mic_jack_event(struct notifier_block *nb, unsigned long event,
481479

482480
if (event & SND_JACK_MICROPHONE)
483481
/* Disable dmic if microphone is plugged in */
484-
snd_soc_dapm_disable_pin(dapm, "DMIC");
482+
return snd_soc_dapm_disable_pin(dapm, "DMIC");
485483
else
486-
snd_soc_dapm_enable_pin(dapm, "DMIC");
487-
488-
return 0;
484+
return snd_soc_dapm_enable_pin(dapm, "DMIC");
489485
}
490486

491487
static struct notifier_block mic_jack_nb = {

0 commit comments

Comments
 (0)