diff options
| author | David Jander <david@protonic.nl> | 2011-06-08 11:37:45 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-20 12:48:11 -0800 |
| commit | 8a6e41581a4537b53c038a328c558d455a6f3e3a (patch) | |
| tree | 1f6c0b1e0795548140bacc4088cc198b547018fc | |
| parent | a5e2201319ef3c88cf8d777466c0e097625ba942 (diff) | |
| download | kernel_samsung_smdk4412-8a6e41581a4537b53c038a328c558d455a6f3e3a.zip kernel_samsung_smdk4412-8a6e41581a4537b53c038a328c558d455a6f3e3a.tar.gz kernel_samsung_smdk4412-8a6e41581a4537b53c038a328c558d455a6f3e3a.tar.bz2 | |
gpio/pca953x: Fix warning of enabled interrupts in handler
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 <david@protonic.nl>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Yong Zhang <yong.zhang0@gmail.com>
Cc: Manfred Gruber <m.gruber@unverspurt.at>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpio/pca953x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 0451d7a..532f690 100644 --- 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 |