summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-14 08:34:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-14 08:34:56 -0800
commit5d69561b7b32b89380b5390b62e5a0c50bfe6568 (patch)
tree7862fbe44321ffb8c39c49800587f9a622311c62 /kernel
parent5ad62a9e5cf82e31ac8fc302e4090cbd0bbc1615 (diff)
parent7ee7e87dfb158e79019ea1d5ea1b0e6f2bc93ee4 (diff)
downloadlinux-5d69561b7b32b89380b5390b62e5a0c50bfe6568.tar.gz
linux-5d69561b7b32b89380b5390b62e5a0c50bfe6568.tar.bz2
linux-5d69561b7b32b89380b5390b62e5a0c50bfe6568.zip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar: "This fixes a genirq regression that resulted in the Intel/Broxton pinctrl/GPIO driver (and possibly others) spewing warnings" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Use irq type from irqdata instead of irqdesc
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/manage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 9c4d30483264..6b669593e7eb 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1341,12 +1341,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
} else if (new->flags & IRQF_TRIGGER_MASK) {
unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK;
- unsigned int omsk = irq_settings_get_trigger_mask(desc);
+ unsigned int omsk = irqd_get_trigger_type(&desc->irq_data);
if (nmsk != omsk)
/* hope the handler works with current trigger mode */
pr_warn("irq %d uses trigger mode %u; requested %u\n",
- irq, nmsk, omsk);
+ irq, omsk, nmsk);
}
*old_ptr = new;