From 46018bcda3568bd2c0a28167a3fa99833ea008b4 Mon Sep 17 00:00:00 2001 From: David Jander Date: Wed, 8 Jun 2011 11:37:45 -0600 Subject: [PATCH] --- yaml --- r: 256689 b: refs/heads/master c: 6dd599f8af0166805951f4421a78ba716d78321a h: refs/heads/master i: 256687: cc0e073bb8b1f92e7ee8335e48c88df8a59fe020 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-pca953x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3e2fef70741..039bd75f8ef6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17e8b42c17c3e9735ea03c4e6b67cedf5de170f4 +refs/heads/master: 6dd599f8af0166805951f4421a78ba716d78321a diff --git a/trunk/drivers/gpio/gpio-pca953x.c b/trunk/drivers/gpio/gpio-pca953x.c index 17e55701394b..4b8446e98de5 100644 --- a/trunk/drivers/gpio/gpio-pca953x.c +++ b/trunk/drivers/gpio/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); @@ -485,8 +485,8 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, irq_clear_status_flags(irq, IRQ_NOREQUEST); 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