Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc/topic/zx296702' into asoc-next
This commit is contained in:
@@ -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 */
|
||||
|
Verwijs in nieuw issue
Block a user