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 91df4da7ddb9dbb90bc1e80a749175199e3856f1..33c4f683d067063488115e720b3c0b83861e73e9 100644 (file)
--- a/arch/mips/pci/pci-vr41xx.c
+++ b/arch/mips/pci/pci-vr41xx.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2001-2003 MontaVista Software Inc.
  *    Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
- *  Copyright (C) 2004-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *  Copyright (C) 2004-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *  Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -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));