3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: David Jander <[email protected]>

commit 6dd599f8af0166805951f4421a78ba716d78321a upstream.

When using nested threaded irqs, use handle_nested_irq(). This function
does not call the chip handler, so no handler is set.

Signed-off-by: David Jander <[email protected]>
Signed-off-by: Grant Likely <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Yong Zhang <[email protected]>
Cc: Manfred Gruber <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/gpio/pca953x.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -437,7 +437,7 @@ static irqreturn_t pca953x_irq_handler(i
 
        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 pca9
                        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


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to