diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/powerpc/kernel/prom_parse.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/prom_parse.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index cdcd5d665468..59f69d34cb67 100644 --- 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 | |||
| 885 | intsize = *tmp; | 885 | intsize = *tmp; |
| 886 | 886 | ||
| 887 | /* Check index */ | 887 | /* Check index */ |
| 888 | if (index * intsize >= intlen) | 888 | if ((index + 1) * intsize > intlen) |
| 889 | return -EINVAL; | 889 | return -EINVAL; |
| 890 | 890 | ||
| 891 | /* Get new specifier and map it */ | 891 | /* Get new specifier and map it */ |