[PATCH] ASoC: fsl-asoc-card: Fix jack_event() always return 0

[Shengjiu Wang]

Hi

On Fri, Mar 18, 2022 at 5:35 PM Meng Tang <tangmeng at 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.
>
> This patch corrects the behavior by properly returning 1 when the
> value gets updated.
>
> Signed-off-by: Meng Tang <tangmeng at uniontech.com>
> ---
>  sound/soc/fsl/fsl-asoc-card.c | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
> index 370bc790c6ba..f2641c2cb047 100644
> --- a/sound/soc/fsl/fsl-asoc-card.c
> +++ b/sound/soc/fsl/fsl-asoc-card.c
> @@ -457,16 +457,18 @@ static int fsl_asoc_card_audmux_init(struct
> device_node *np,
>  static int hp_jack_event(struct notifier_block *nb, unsigned long event,
>                          void *data)
>  {
> +       int ret;
> +
>         struct snd_soc_jack *jack = (struct snd_soc_jack *)data;
>         struct snd_soc_dapm_context *dapm = &jack->card->dapm;

The "int ret" should be here.
The variables have order, the short one should be behind the long one.


>




>         if (event & SND_JACK_HEADPHONE)
>                 /* Disable speaker if headphone is plugged in */
> -               snd_soc_dapm_disable_pin(dapm, "Ext Spk");
> +               ret = snd_soc_dapm_disable_pin(dapm, "Ext Spk");
>         else
> -               snd_soc_dapm_enable_pin(dapm, "Ext Spk");
> +               ret = snd_soc_dapm_enable_pin(dapm, "Ext Spk");
>
> -       return 0;
> +       return ret;
>  }
>
>  static struct notifier_block hp_jack_nb = {
> @@ -476,16 +478,18 @@ static struct notifier_block hp_jack_nb = {
>  static int mic_jack_event(struct notifier_block *nb, unsigned long event,
>                           void *data)
>  {
> +       int ret;
> +
>         struct snd_soc_jack *jack = (struct snd_soc_jack *)data;
>         struct snd_soc_dapm_context *dapm = &jack->card->dapm;
>
ditto.

>
>         if (event & SND_JACK_MICROPHONE)
>                 /* Disable dmic if microphone is plugged in */
> -               snd_soc_dapm_disable_pin(dapm, "DMIC");
> +               ret = snd_soc_dapm_disable_pin(dapm, "DMIC");
>         else
> -               snd_soc_dapm_enable_pin(dapm, "DMIC");
> +               ret = snd_soc_dapm_enable_pin(dapm, "DMIC");
>
> -       return 0;
> +       return ret;
>  }
>
>  static struct notifier_block mic_jack_nb = {
> --
> 2.20.1
>
>
>
>