wm8994 trivial merge fix
Subsystems (3)
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
---
Quoted 1 line
From
6cab3e1e65bfe070f09bb091eeda182b171d5929Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <[email protected]>
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 <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- sound/soc/codecs/wm8994.c | 3 --- 1 file changed, 3 deletions(-)
sound/soc/codecs/wm8994.c +0 -3
@@ -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 ;
Signature · 1 line
1.7.10.4
Quoted 3 lines · Takashi Iwai
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.