[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20100820214916.GH3650@sortiz-mobl>
Date: Fri, 20 Aug 2010 23:49:16 +0200
From: Samuel Ortiz <sameo@...ux.intel.com>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: linux-kernel@...r.kernel.org, stable@...nel.org
Subject: Re: [PATCH 2.6.36] mfd: Ignore non-GPIO IRQs when setting wm831x
IRQ types
Hi Mark,
On Mon, Aug 16, 2010 at 08:26:51PM +0100, Mark Brown wrote:
> The driver was originally tested with an additional patch which
> made this unneeded but that patch had issuges and got lost on the
> way to mainline, causing problems when the errors are reported.
Thanks, applied to my for-linus branch.
I'll send it with my next 2.6.36 mfd fixes pull request.
Cheers,
Samuel.
> Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
> Cc: stable@...nel.org
> ---
> drivers/mfd/wm831x-irq.c | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
> index 7dabe4d..294183b 100644
> --- a/drivers/mfd/wm831x-irq.c
> +++ b/drivers/mfd/wm831x-irq.c
> @@ -394,8 +394,13 @@ static int wm831x_irq_set_type(unsigned int irq, unsigned int type)
>
> irq = irq - wm831x->irq_base;
>
> - if (irq < WM831X_IRQ_GPIO_1 || irq > WM831X_IRQ_GPIO_11)
> - return -EINVAL;
> + if (irq < WM831X_IRQ_GPIO_1 || irq > WM831X_IRQ_GPIO_11) {
> + /* Ignore internal-only IRQs */
> + if (irq >= 0 && irq < WM831X_NUM_IRQS)
> + return 0;
> + else
> + return -EINVAL;
> + }
>
> switch (type) {
> case IRQ_TYPE_EDGE_BOTH:
> --
> 1.7.1
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists