From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 9 Feb 2012 12:00:22 +0000 (+0000)
Subject: Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
X-Git-Tag: v3.4-rc1~88^2^2~27^2~128
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a08a499aa3d85b605b5669cfc82b8e14232f7e91;p=~emulex%2Finfiniband.git

Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development.

Linux 3.3-rc3

.. the number of the half-beast?

Conflicts:
	sound/soc/codecs/wm5100.c
	sound/soc/codecs/wm8994.c
---

a08a499aa3d85b605b5669cfc82b8e14232f7e91
diff --cc sound/soc/codecs/wm5100.c
index f6b6ea89802,89f2af77b1c..2339aa0e945
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@@ -2051,8 -2182,9 +2051,9 @@@ static void wm5100_micd_irq(struct wm51
  	 */
  	if (val & 0x400) {
  		if (wm5100->jack_detecting) {
 -			dev_dbg(codec->dev, "Microphone detected\n");
 +			dev_dbg(wm5100->dev, "Microphone detected\n");
  			wm5100->jack_mic = true;
+ 			wm5100->jack_detecting = false;
  			snd_soc_jack_report(wm5100->jack,
  					    SND_JACK_HEADSET,
  					    SND_JACK_HEADSET | SND_JACK_BTN_0);