linux-next: manual merge of the sound-asoc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/codecs/wm5100.c due to a bad merge resolution in commit
05960268bcef ("Merge branch 'for-3.4' into asoc-next") from the
sound-asoc tree which left the conflict unresolved.  :-(

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc sound/soc/codecs/wm5100.c
index c1c351a,72ebbdb..0000000
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@@ -2076,17 -2097,21 +2097,7 @@@ static void wm5100_micd_irq(struct wm51
  			snd_soc_jack_report(wm5100->jack, SND_JACK_BTN_0,
  					    SND_JACK_BTN_0);
  		} else if (wm5100->jack_detecting) {
- 			dev_dbg(wm5100->dev, "Headphone detected\n");
- 			wm5100->jack_detecting = false;
- 			snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
- 					    SND_JACK_HEADPHONE);
- 
- 			/* Increase the detection rate a bit for
- 			 * responsiveness.
- 			 */
- 			regmap_update_bits(wm5100->regmap, WM5100_MIC_DETECT_1,
- 					   WM5100_ACCDET_RATE_MASK,
- 					   7 << WM5100_ACCDET_RATE_SHIFT);
 -<<<<<<< HEAD
 -			dev_dbg(codec->dev, "Headphone detected\n");
 -			wm5100->jack_detecting = false;
 -			snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
 -					    SND_JACK_HEADPHONE);
 -
 -			/* Increase the detection rate a bit for
 -			 * responsiveness.
 -			 */
 -			snd_soc_update_bits(codec, WM5100_MIC_DETECT_1,
 -					    WM5100_ACCDET_RATE_MASK,
 -					    7 << WM5100_ACCDET_RATE_SHIFT);
 -=======
+ 			wm5100_report_headphone(wm5100);
 ->>>>>>> for-3.4
  		}
  	}
  }

Attachment: pgp00000.pgp
Description: PGP signature