xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into irq/core

Browse Source 
Get upstream changes so pending patches won't conflict.
This commit is contained in:
Thomas Gleixner
2017-06-20 22:08:32 +02:00
parent 04c848d398 41f1830f5a
commit b50fb7c992
1141 changed files with 12823 additions and 7399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/irq/manage.c
View File

@@ -1318,8 +1318,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
ret = __irq_set_trigger(desc,
new->flags & IRQF_TRIGGER_MASK);
if (ret)
if (ret) {
irq_release_resources(desc);
goto out_mask;
}
}
desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \