Merge branch 'master' of git://git.denx.de/u-boot-x86

[oweals/u-boot.git] / board / esd / cpci750 / ide.c

diff --git a/board/esd/cpci750/ide.c b/board/esd/cpci750/ide.c
index 9bdc52345346f5730e911e0738544ca862a77ac3..a3bd1b73d5801e75755a36dfd50c0a90e84bf9ee 100644 (file)
--- a/board/esd/cpci750/ide.c
+++ b/board/esd/cpci750/ide.c
@@ -39,6 +39,8 @@ int ide_preinit (void)
        int l;
 
        status = 1;
+       if (CPCI750_SLAVE_TEST != 0)
+               return status;
        for (l = 0; l < CONFIG_SYS_IDE_MAXBUS; l++) {
                ide_bus_offset[l] = -ATA_STATUS;
        }
@@ -46,18 +48,22 @@ int ide_preinit (void)
        if (devbusfn == -1)
                devbusfn = pci_find_device (0x1095, 0x3114, 0);
        if (devbusfn != -1) {
+               ulong *ide_bus_offset_ptr;
+
                status = 0;
 
+               ide_bus_offset_ptr = &ide_bus_offset[0];
                pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0,
-                                      (u32 *) & ide_bus_offset[0]);
+                                      (u32 *)ide_bus_offset_ptr);
                ide_bus_offset[0] &= 0xfffffffe;
                ide_bus_offset[0] += CONFIG_SYS_PCI0_IO_SPACE;
+               ide_bus_offset_ptr = &ide_bus_offset[1];
                pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_2,
-                                      (u32 *) & ide_bus_offset[1]);
+                                      (u32 *)ide_bus_offset_ptr);
                ide_bus_offset[1] &= 0xfffffffe;
                ide_bus_offset[1] += CONFIG_SYS_PCI0_IO_SPACE;
        }
-       return (status);
+       return status;
 }
 
 void ide_set_reset (int flag) {