[alsa-devel] [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering

[Liam Girdwood]

On Tue, 2011-02-22 at 04:52 +0000, Mark Brown wrote:
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/codecs/wm8994.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
> index 4df047e..5f16870 100644
> --- a/sound/soc/codecs/wm8994.c
> +++ b/sound/soc/codecs/wm8994.c
> @@ -3012,11 +3012,10 @@ static void wm8958_default_micdet(u16 status, void *data)
>  		report |= SND_JACK_BTN_5;
>  
>  done:
> -	snd_soc_jack_report(wm8994->micdet[0].jack,
> +	snd_soc_jack_report(wm8994->micdet[0].jack, report,
>  			    SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
>  			    SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
> -			    SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT,
> -			    report);
> +			    SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT);
>  }
>  
>  /**

both

Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>