Merge branch 'merge'

This commit is contained in:
Paul Mackerras
2006-08-01 10:37:25 +10:00
1510 changed files with 22961 additions and 13521 deletions

View File

@@ -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 */