x86, pci: fix off-by-one errors in some pirq warnings

commit 223ac2f42d49dd0324ca02ea15897ead1a2f5133 upstream.

fix bogus pirq warnings reported in:

  http://bugzilla.kernel.org/show_bug.cgi?id=10366

safe to be backported to v2.6.25 and earlier.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index a8715861877e7648d34782b67635f8248f54610f..579745ca6b667dd0ccb7c62ac1133c42c7527088 100644 (file)
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -200,7 +200,7 @@ static int pirq_ali_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
 {
        static const unsigned char irqmap[16] = { 0, 9, 3, 10, 4, 5, 7, 6, 1, 11, 0, 12, 0, 14, 0, 15 };
 
-       WARN_ON_ONCE(pirq >= 16);
+       WARN_ON_ONCE(pirq > 16);
        return irqmap[read_config_nybble(router, 0x48, pirq-1)];
 }
 
@@ -209,7 +209,7 @@ static int pirq_ali_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i
        static const unsigned char irqmap[16] = { 0, 8, 0, 2, 4, 5, 7, 6, 0, 1, 3, 9, 11, 0, 13, 15 };
        unsigned int val = irqmap[irq];
 
-       WARN_ON_ONCE(pirq >= 16);
+       WARN_ON_ONCE(pirq > 16);
        if (val) {
                write_config_nybble(router, 0x48, pirq-1, val);
                return 1;
@@ -260,7 +260,7 @@ static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int pirq
 {
        static const unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
 
-       WARN_ON_ONCE(pirq >= 5);
+       WARN_ON_ONCE(pirq > 5);
        return read_config_nybble(router, 0x55, pirqmap[pirq-1]);
 }
 
@@ -268,7 +268,7 @@ static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq
 {
        static const unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
 
-       WARN_ON_ONCE(pirq >= 5);
+       WARN_ON_ONCE(pirq > 5);
        write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);
        return 1;
 }
@@ -282,7 +282,7 @@ static int pirq_ite_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
 {
        static const unsigned char pirqmap[4] = { 1, 0, 2, 3 };
 
-       WARN_ON_ONCE(pirq >= 4);
+       WARN_ON_ONCE(pirq > 4);
        return read_config_nybble(router,0x43, pirqmap[pirq-1]);
 }
 
@@ -290,7 +290,7 @@ static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i
 {
        static const unsigned char pirqmap[4] = { 1, 0, 2, 3 };
 
-       WARN_ON_ONCE(pirq >= 4);
+       WARN_ON_ONCE(pirq > 4);
        write_config_nybble(router, 0x43, pirqmap[pirq-1], irq);
        return 1;
 }