| Message ID | 20220321065754.18307-1-tangmeng@uniontech.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5cb90dcb6ad569f4968da6dd841db10b91df5642 |
| Headers | show |
| Series | [v2] ASoC: fsl-asoc-card: Fix jack_event() always return 0 | expand |
Le 21/03/2022 à 07:57, Meng Tang a écrit : > 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> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > sound/soc/fsl/fsl-asoc-card.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c > index 370bc790c6ba..d9a0d4768c4d 100644 > --- a/sound/soc/fsl/fsl-asoc-card.c > +++ b/sound/soc/fsl/fsl-asoc-card.c > @@ -462,11 +462,9 @@ static int hp_jack_event(struct notifier_block *nb, unsigned long event, > > if (event & SND_JACK_HEADPHONE) > /* Disable speaker if headphone is plugged in */ > - snd_soc_dapm_disable_pin(dapm, "Ext Spk"); > + return snd_soc_dapm_disable_pin(dapm, "Ext Spk"); > else > - snd_soc_dapm_enable_pin(dapm, "Ext Spk"); > - > - return 0; > + return snd_soc_dapm_enable_pin(dapm, "Ext Spk"); > } > > static struct notifier_block hp_jack_nb = { > @@ -481,11 +479,9 @@ static int mic_jack_event(struct notifier_block *nb, unsigned long event, > > if (event & SND_JACK_MICROPHONE) > /* Disable dmic if microphone is plugged in */ > - snd_soc_dapm_disable_pin(dapm, "DMIC"); > + return snd_soc_dapm_disable_pin(dapm, "DMIC"); > else > - snd_soc_dapm_enable_pin(dapm, "DMIC"); > - > - return 0; > + return snd_soc_dapm_enable_pin(dapm, "DMIC"); > } > > static struct notifier_block mic_jack_nb = {
On Mon, Mar 21, 2022 at 2:58 PM Meng Tang <tangmeng@uniontech.com> wrote: > 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> Best regards Wang Shengjiu > --- > sound/soc/fsl/fsl-asoc-card.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c > index 370bc790c6ba..d9a0d4768c4d 100644 > --- a/sound/soc/fsl/fsl-asoc-card.c > +++ b/sound/soc/fsl/fsl-asoc-card.c > @@ -462,11 +462,9 @@ static int hp_jack_event(struct notifier_block *nb, > unsigned long event, > > if (event & SND_JACK_HEADPHONE) > /* Disable speaker if headphone is plugged in */ > - snd_soc_dapm_disable_pin(dapm, "Ext Spk"); > + return snd_soc_dapm_disable_pin(dapm, "Ext Spk"); > else > - snd_soc_dapm_enable_pin(dapm, "Ext Spk"); > - > - return 0; > + return snd_soc_dapm_enable_pin(dapm, "Ext Spk"); > } > > static struct notifier_block hp_jack_nb = { > @@ -481,11 +479,9 @@ static int mic_jack_event(struct notifier_block *nb, > unsigned long event, > > if (event & SND_JACK_MICROPHONE) > /* Disable dmic if microphone is plugged in */ > - snd_soc_dapm_disable_pin(dapm, "DMIC"); > + return snd_soc_dapm_disable_pin(dapm, "DMIC"); > else > - snd_soc_dapm_enable_pin(dapm, "DMIC"); > - > - return 0; > + return snd_soc_dapm_enable_pin(dapm, "DMIC"); > } > > static struct notifier_block mic_jack_nb = { > -- > 2.20.1 > > > >
On Mon, 21 Mar 2022 14:57:54 +0800, Meng Tang wrote: > 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. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: fsl-asoc-card: Fix jack_event() always return 0 commit: 5cb90dcb6ad569f4968da6dd841db10b91df5642 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 370bc790c6ba..d9a0d4768c4d 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -462,11 +462,9 @@ static int hp_jack_event(struct notifier_block *nb, unsigned long event, if (event & SND_JACK_HEADPHONE) /* Disable speaker if headphone is plugged in */ - snd_soc_dapm_disable_pin(dapm, "Ext Spk"); + return snd_soc_dapm_disable_pin(dapm, "Ext Spk"); else - snd_soc_dapm_enable_pin(dapm, "Ext Spk"); - - return 0; + return snd_soc_dapm_enable_pin(dapm, "Ext Spk"); } static struct notifier_block hp_jack_nb = { @@ -481,11 +479,9 @@ static int mic_jack_event(struct notifier_block *nb, unsigned long event, if (event & SND_JACK_MICROPHONE) /* Disable dmic if microphone is plugged in */ - snd_soc_dapm_disable_pin(dapm, "DMIC"); + return snd_soc_dapm_disable_pin(dapm, "DMIC"); else - snd_soc_dapm_enable_pin(dapm, "DMIC"); - - return 0; + return snd_soc_dapm_enable_pin(dapm, "DMIC"); } static struct notifier_block mic_jack_nb = {
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> --- sound/soc/fsl/fsl-asoc-card.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)