Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / gpio / gpio-em.c

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index 1cc53516e8b420ca13198a6f6d822ef3e5c9249e..1e98a9873967fe43eb0b9e5eb88bdd8a0b760364 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -358,12 +358,10 @@ static int em_gio_probe(struct platform_device *pdev)
        irq_chip->name = name;
        irq_chip->irq_mask = em_gio_irq_disable;
        irq_chip->irq_unmask = em_gio_irq_enable;
-       irq_chip->irq_enable = em_gio_irq_enable;
-       irq_chip->irq_disable = em_gio_irq_disable;
        irq_chip->irq_set_type = em_gio_irq_set_type;
        irq_chip->irq_startup = em_gio_irq_startup;
        irq_chip->irq_shutdown = em_gio_irq_shutdown;
-       irq_chip->flags = IRQCHIP_SKIP_SET_WAKE;
+       irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
 
        p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
                                              pdata->number_of_pins,