summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-11 10:10:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-11 10:10:04 -0700
commit8b02c5ef75814b690ad8eb271cca2559ce7d19b8 (patch)
tree1c9643b2da01bcd41c852423a2f28ddb7b6b597c /drivers
parentc8c16e3624ec9e2b36b76b34266c5064ec7e5f98 (diff)
parentfea685e9f9d0c3d273aa861891bf5ac952012d21 (diff)
downloadlinux-8b02c5ef75814b690ad8eb271cca2559ce7d19b8.tar.bz2
Merge tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull two pin control fixes from Linus Walleij: - fix a warning about unbalanced IRQs on the Baytrail - update Tomasz Figa's address in MAINTAINERS * tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: MAINTAINERS: Tomasz has moved pinctrl: baytrail: resolve unbalanced IRQ wake disable warning
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/pinctrl-baytrail.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-baytrail.c b/drivers/pinctrl/pinctrl-baytrail.c
index 9ca59a018743..e12e5b07f6d7 100644
--- a/drivers/pinctrl/pinctrl-baytrail.c
+++ b/drivers/pinctrl/pinctrl-baytrail.c
@@ -461,6 +461,7 @@ static struct irq_chip byt_irqchip = {
.irq_mask = byt_irq_mask,
.irq_unmask = byt_irq_unmask,
.irq_set_type = byt_irq_type,
+ .flags = IRQCHIP_SKIP_SET_WAKE,
};
static void byt_gpio_irq_init_hw(struct byt_gpio *vg)