Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / arch / mips / pci / pci-vr41xx.c

diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c
index 9885fa40360388e63bae7e60cb32ab594877d376..33c4f683d067063488115e720b3c0b83861e73e9 100644 (file)
--- a/arch/mips/pci/pci-vr41xx.c
+++ b/arch/mips/pci/pci-vr41xx.c
@@ -154,6 +154,7 @@ static int __init vr41xx_pciu_init(void)
                pciu_write(PCICLKSELREG, QUARTER_VTCLOCK);
        else {
                printk(KERN_ERR "PCI Clock is over 33MHz.\n");
+               iounmap(pciu_base);
                return -EINVAL;
        }
 
@@ -228,7 +229,7 @@ static int __init vr41xx_pciu_init(void)
        else
                pciu_write(PCIEXACCREG, 0);
 
-       if (current_cpu_data.cputype == CPU_VR4122)
+       if (current_cpu_type() == CPU_VR4122)
                pciu_write(PCITRDYVREG, TRDYV(setup->wait_time_limit_from_irdy_to_trdy));
 
        pciu_write(LATTIMEREG, MLTIM(setup->master_latency_timer));