]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] fix ancient breakage in ebus_init()
authorAl Viro <viro@ftp.linux.org.uk>
Sat, 23 Sep 2006 00:18:41 +0000 (01:18 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 23 Sep 2006 00:48:56 +0000 (17:48 -0700)
Back when pci_dev had base_address[], loop of form
base = &...->base_address[0];
for (.....) {
...
*base++ = addr;
}
was fine, but when that array got spread in ->resource[...].start
replacing the initialization with
base = &...->resource[0].start;
was not a sufficient modification.  IOW this code got broken for cases
when there had been more than one resource to fill.  All way back in
2.3.41-pre3...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/sparc/kernel/ebus.c

index 81c0cbd96ff01f271f888892aa79543ffa417661..75ac24d229b1dda145b04ac1f68f317e050e47b3 100644 (file)
@@ -277,7 +277,7 @@ void __init ebus_init(void)
        struct pci_dev *pdev;
        struct pcidev_cookie *cookie;
        struct device_node *dp;
-       unsigned long addr, *base;
+       struct resource *p;
        unsigned short pci_command;
        int len, reg, nreg;
        int num_ebus = 0;
@@ -321,13 +321,12 @@ void __init ebus_init(void)
                }
                nreg = len / sizeof(struct linux_prom_pci_registers);
 
-               base = &ebus->self->resource[0].start;
+               p = &ebus->self->resource[0];
                for (reg = 0; reg < nreg; reg++) {
                        if (!(regs[reg].which_io & 0x03000000))
                                continue;
 
-                       addr = regs[reg].phys_lo;
-                       *base++ = addr;
+                       (p++)->start = regs[reg].phys_lo;
                }
 
                ebus->ofdev.node = dp;