[PATCH] rb532: fix irq number check in rb532_set_type

[PATCH] rb532: fix irq number check in rb532_set_type

[Florian Fainelli]

We only have 14 GPIO interrupt sources numbered
from 0 to 13. Therefore the check against irq_nr
in rb532_set_type is off-by-one. This fixes a mistake
introduced by commit 1b4f571632ffb0caa4170d886694f2555c0d9a4b.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c
index 8ac4372..f078820 100644
--- a/arch/mips/rb532/irq.c
+++ b/arch/mips/rb532/irq.c
@@ -175,7 +175,7 @@ static int rb532_set_type(unsigned int irq_nr, unsigned type)
 	int gpio = irq_nr - GPIO_MAPPED_IRQ_BASE;
 	int group = irq_to_group(irq_nr);
 
-	if (group != GPIO_MAPPED_IRQ_GROUP || irq_nr >= (GROUP4_IRQ_BASE + 13))
+	if (group != GPIO_MAPPED_IRQ_GROUP || irq_nr > (GROUP4_IRQ_BASE + 13))
 		return (type == IRQ_TYPE_LEVEL_HIGH) ? 0 : -EINVAL;
 
 	switch (type) {

Re: [PATCH] rb532: fix irq number check in rb532_set_type

[Ralf Baechle]

On Wed, May 27, 2009 at 02:14:06PM +0200, Florian Fainelli wrote:

> We only have 14 GPIO interrupt sources numbered
> from 0 to 13. Therefore the check against irq_nr
> in rb532_set_type is off-by-one. This fixes a mistake
> introduced by commit 1b4f571632ffb0caa4170d886694f2555c0d9a4b.

Thanks; I've folded this patch into your old patch.

A note on commit IDs on the -queue tree.  The -queue tree is really
maintained in quilt and respun every time I change any of the commits
on it.  This means the commit IDs will also change, so they should be
considered volatile.

  Ralf

Re: [PATCH] rb532: fix irq number check in rb532_set_type

[Florian Fainelli]

Le Wednesday 27 May 2009 15:15:35 Ralf Baechle, vous avez écrit :
> On Wed, May 27, 2009 at 02:14:06PM +0200, Florian Fainelli wrote:
> > We only have 14 GPIO interrupt sources numbered
> > from 0 to 13. Therefore the check against irq_nr
> > in rb532_set_type is off-by-one. This fixes a mistake
> > introduced by commit 1b4f571632ffb0caa4170d886694f2555c0d9a4b.
>
> Thanks; I've folded this patch into your old patch.

Thank you !

>
> A note on commit IDs on the -queue tree.  The -queue tree is really
> maintained in quilt and respun every time I change any of the commits
> on it.  This means the commit IDs will also change, so they should be
> considered volatile.

I will take that into account next time, thanks for fixing this.
-- 
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------