]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
sparc: _sparc_find_resource() should check for exact matches
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sat, 7 May 2011 13:08:36 +0000 (15:08 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sat, 30 Jul 2011 19:21:38 +0000 (21:21 +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>
arch/sparc/kernel/ioport.c

index 1c9c80a1a86af87611d4b77cc8b5a2c5244d1574..b5e83beb5b6bf206634e2907f29e09d8c2f5c7f2 100644 (file)
@@ -723,12 +723,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;