Merge branch 'merge'

[safe/jmp/linux-2.6] / arch / powerpc / kernel / prom_parse.c

diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index cdcd5d6..59f69d3 100644 (file)
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -885,7 +885,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
        intsize = *tmp;
 
        /* Check index */
-       if (index * intsize >= intlen)
+       if ((index + 1) * intsize > intlen)
                return -EINVAL;
 
        /* Get new specifier and map it */