diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-04-19 16:08:42 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-04-19 16:09:11 -0700 |
| commit | 84c606de0617ba304bca456f0ad06729198a5333 (patch) | |
| tree | d6f615065646e72ae0914260388db121297b3c02 /drivers/gpio | |
| parent | a6d21d824242244ec6c02c18a517bf021f1e70cd (diff) | |
| parent | 0527fde0639955203ad48a9fd83bd6fc35e82e07 (diff) | |
| download | kernel_samsung_tuna-84c606de0617ba304bca456f0ad06729198a5333.zip kernel_samsung_tuna-84c606de0617ba304bca456f0ad06729198a5333.tar.gz kernel_samsung_tuna-84c606de0617ba304bca456f0ad06729198a5333.tar.bz2 | |
Merge linux-stable 3.0.28 into linux-omap-3.0
Change-Id: I76904a60370e2cb9cc29ccde5d526d9183ff4f8e
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/gpio')
| -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 |