Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc...

[karo-tx-linux.git] / sound / soc / codecs / wm5100.c

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 98495dd6123998de3511656e3aa7ac7c1134c968..4c10cd88c1af66a1a54b168c34844c190e077b9d 100644 (file)
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2570,11 +2570,13 @@ static int wm5100_i2c_probe(struct i2c_client *i2c,
 
                if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
                        ret = request_threaded_irq(i2c->irq, NULL,
-                                                  wm5100_edge_irq, irq_flags,
+                                                  wm5100_edge_irq,
+                                                  irq_flags | IRQF_ONESHOT,
                                                   "wm5100", wm5100);
                else
                        ret = request_threaded_irq(i2c->irq, NULL, wm5100_irq,
-                                                  irq_flags, "wm5100",
+                                                  irq_flags | IRQF_ONESHOT,
+                                                  "wm5100",
                                                   wm5100);
 
                if (ret != 0) {