lkml.org 
[lkml]   [2011]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v5 1/5] GPIO: pca953x.c: Fix IRQ support.
On Tue, Jun 14, 2011 at 11:00:54AM +0200, David Jander wrote:
> It seems that in the normal case, IRQ_NOREQUEST needs to be explicitly
> cleared, otherwise claiming the interrupt fails.
> In the case of sparse interrupts, the descriptor needs to be allocated
> first.
>
> Signed-off-by: David Jander <david@protonic.nl>

Merged, thanks.

g.

> ---
> drivers/gpio/pca953x.c | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
> index 0451d7a..5f6940a 100644
> --- a/drivers/gpio/pca953x.c
> +++ b/drivers/gpio/pca953x.c
> @@ -474,12 +474,16 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
> * this purpose.
> */
> chip->irq_stat &= chip->reg_direction;
> - chip->irq_base = pdata->irq_base;
> mutex_init(&chip->irq_lock);
>
> + chip->irq_base = irq_alloc_descs(-1, pdata->irq_base, chip->gpio_chip.ngpio, -1);
> + if (chip->irq_base < 0)
> + goto out_failed;
> +
> for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) {
> int irq = lvl + chip->irq_base;
>
> + 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);
> @@ -514,8 +518,10 @@ out_failed:
>
> static void pca953x_irq_teardown(struct pca953x_chip *chip)
> {
> - if (chip->irq_base != -1)
> + if (chip->irq_base != -1) {
> + irq_free_descs(chip->irq_base, chip->gpio_chip.ngpio);
> free_irq(chip->client->irq, chip);
> + }
> }
> #else /* CONFIG_GPIO_PCA953X_IRQ */
> static int pca953x_irq_setup(struct pca953x_chip *chip,
> --
> 1.7.4.1
>


\
 
 \ /
  Last update: 2011-06-16 21:49    [W:0.066 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site