wm8994 trivial merge fix

wm8994 trivial merge fix

[Takashi Iwai]

FYI,

the patch below is what I applied from Jaroslav's tree.
I simply picked it up directly into my tree (fix/asoc and for-linus
branches) because of triviality.


Takashi

---
>From 6cab3e1e65bfe070f09bb091eeda182b171d5929 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 28 May 2012 11:14:33 +0200
Subject: [PATCH] ASoC: wm8994: remove duplicate code

It seems that the code duplication was added at a merge operation.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/codecs/wm8994.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index aa8c98b..1436b6c 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -727,9 +727,6 @@ static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode)
 	if (!wm8994->jackdet || !wm8994->jack_cb)
 		return;
 
-	if (!wm8994->jackdet || !wm8994->jack_cb)
-		return;
-
 	if (wm8994->active_refcount)
 		mode = WM1811_JACKDET_MODE_AUDIO;
 
-- 
1.7.10.4

Re: wm8994 trivial merge fix

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 355 bytes --]

On Mon, Jun 25, 2012 at 11:38:48AM +0200, Takashi Iwai wrote:

> the patch below is what I applied from Jaroslav's tree.
> I simply picked it up directly into my tree (fix/asoc and for-linus
> branches) because of triviality.

Thanks for telling me - Jaroslav, please send changes like this rather
than just leaving them sitting waiting to be discovered.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]