projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d770e55)
ASoC: wm8996: Remove spurious IRQF_ONESHOT flag
authorAxel Lin <axel.lin@ingics.com>
Thu, 2 Jul 2015 13:29:01 +0000 (21:29 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 8 Jul 2015 18:33:49 +0000 (19:33 +0100)
This reverts ed043aebe6ec ("ASoC: wm8996: Pass the IRQF_ONESHOT flag").

The coccinelle warnings is false positive because the original code does
set IRQF_ONESHOT by "trigger |= IRQF_ONESHOT;".

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8996.c patch | blob | blame | history

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 3dd063f682b29f6fa4e1bb1dbdda1a3305c750bc..370459fcf21cb85f3fed9b782fd34d5a28dc89e2 100644 (file)
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2647,12 +2647,10 @@ static int wm8996_probe(struct snd_soc_codec *codec)
                if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
                        ret = request_threaded_irq(i2c->irq, NULL,
                                                   wm8996_edge_irq,
-                                                  irq_flags | IRQF_ONESHOT,
-                                                  "wm8996", codec);
+                                                  irq_flags, "wm8996", codec);
                else
                        ret = request_threaded_irq(i2c->irq, NULL, wm8996_irq,
-                                                  irq_flags | IRQF_ONESHOT,
-                                                  "wm8996", codec);
+                                                  irq_flags, "wm8996", codec);
 
                if (ret == 0) {
                        /* Unmask the interrupt */