On Tue, Mar 26, 2013 at 03:40:14PM +0000, Mark Brown wrote: > I've taken the liberty of pulling into ASoC already, if there's a > problem with that I can drop the changes easily enough.
While adding the ASoC stuff on top I realised that one of the overlapping changes should just be squashed down into the ASoC change here so I've gone ahead and done that and redone the tag, sorry about the noise. From 04f2108cbde151329b7222d5399df71376a76358 Mon Sep 17 00:00:00 2001 From: Mark Brown <[email protected]> Date: Mon, 25 Mar 2013 10:10:35 +0000 Subject: [PATCH] ASoC: arizona: Ensure generic output event is run for headphones Signed-off-by: Mark Brown <[email protected]> --- sound/soc/codecs/arizona.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 05f36bc..1e6b1c0 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -631,7 +631,7 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w, snd_soc_update_bits(w->codec, ARIZONA_OUTPUT_ENABLES_1, mask, val); - return 0; + return arizona_out_ev(w, kcontrol, event); } EXPORT_SYMBOL_GPL(arizona_hp_ev); -- 1.7.10.4
signature.asc
Description: Digital signature
