Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm8996.c

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index a1905433b1253d2dfcf5d1aeeb8ee0eccdf50993..f7ccd9fc5808e56950225d2ccccd7a8ad8d2de62 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 */