Module Name: src
Committed By: jmcneill
Date: Wed May 25 12:43:08 UTC 2016
Modified Files:
src/sys/dev/fdt: fdt_intr.c
Log Message:
Fix get_specifier_by_index to work with indexes greater than 0.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/fdt/fdt_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/fdt_intr.c
diff -u src/sys/dev/fdt/fdt_intr.c:1.7 src/sys/dev/fdt/fdt_intr.c:1.8
--- src/sys/dev/fdt/fdt_intr.c:1.7 Sun Jan 10 23:01:29 2016
+++ src/sys/dev/fdt/fdt_intr.c Wed May 25 12:43:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_intr.c,v 1.7 2016/01/10 23:01:29 marty Exp $ */
+/* $NetBSD: fdt_intr.c,v 1.8 2016/05/25 12:43:08 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.7 2016/01/10 23:01:29 marty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.8 2016/05/25 12:43:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -334,7 +334,6 @@ static u_int *get_specifier_by_index(int
return NULL;
}
- const u_int clen = interrupt_cells * sizeof(u_int);
const u_int nintr = len / interrupt_cells;
if (pindex >= nintr)
@@ -349,7 +348,7 @@ static u_int *get_specifier_by_index(int
specifier = kmem_alloc(interrupt_cells * sizeof(u_int), KM_SLEEP);
*spec_length = interrupt_cells * sizeof(u_int);
for (int i = 0; i < interrupt_cells; i++)
- specifier[i] = specifiers[pindex * clen + i];
+ specifier[i] = specifiers[pindex * interrupt_cells + i];
kmem_free(specifiers, len);
return specifier;
}
