rk3066b: fix gpio usage

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / pca953x.c

diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 0451d7ac94ac1d51b062d0da4ce19e4e12b6bdf4..532f69006264497edf0b90417a8b365aa19b6a84 100644 (file)
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -437,7 +437,7 @@ static irqreturn_t pca953x_irq_handler(int irq, void *devid)
 
        do {
                level = __ffs(pending);
-               generic_handle_irq(level + chip->irq_base);
+               handle_nested_irq(level + chip->irq_base);
 
                pending &= ~(1 << level);
        } while (pending);
@@ -481,8 +481,8 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
                        int irq = lvl + chip->irq_base;
 
                        irq_set_chip_data(irq, chip);
-                       irq_set_chip_and_handler(irq, &pca953x_irq_chip,
-                                                handle_simple_irq);
+                       irq_set_chip(irq, &pca953x_irq_chip);
+                       irq_set_nested_thread(irq, true);
 #ifdef CONFIG_ARM
                        set_irq_flags(irq, IRQF_VALID);
 #else