| Message ID | 1306006756-32009-2-git-send-email-geert@linux-m68k.org |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
From: Geert Uytterhoeven <geert@linux-m68k.org> Date: Sat, 21 May 2011 21:39:13 +0200 > The address that's passed to _sparc_find_resource() should always be the > start address of a resource: > - iounmap() passes a page-aligned virtual address, while the original > address was created by adding the in-page offset to the resource's > start address, > - sbus_free_coherent() and pci32_free_coherent() should be passed an > address obtained from sbus_alloc_coherent() resp. pci32_alloc_coherent(), > which is always a resource's start address. > > Hence replace the range check by a check for an exact match. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index c6ce9a6..91e8c76 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -733,12 +733,12 @@ static const struct file_operations sparc_io_proc_fops = { * This probably warrants some sort of hashing. */ static struct resource *_sparc_find_resource(struct resource *root, - unsigned long hit) + unsigned long start) { struct resource *tmp; for (tmp = root->child; tmp != 0; tmp = tmp->sibling) { - if (tmp->start <= hit && tmp->end >= hit) + if (tmp->start == start) return tmp; } return NULL;
The address that's passed to _sparc_find_resource() should always be the start address of a resource: - iounmap() passes a page-aligned virtual address, while the original address was created by adding the in-page offset to the resource's start address, - sbus_free_coherent() and pci32_free_coherent() should be passed an address obtained from sbus_alloc_coherent() resp. pci32_alloc_coherent(), which is always a resource's start address. Hence replace the range check by a check for an exact match. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- arch/sparc/kernel/ioport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)