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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 3 Feb 2012 12:59:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...mlogic.co.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the sound-asoc tree

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@...b.auug.org.au

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
  		}
  	}
  }

Content of type "application/pgp-signature" skipped