From: Wolfgang Denk Date: Mon, 7 Nov 2011 21:43:37 +0000 (+0100) Subject: board/linkstation/ide.c: Fix GCC 4.6 build warnings X-Git-Tag: v2011.12-rc1~248 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=53862da918937ec8ad1f44f8c4862e98d98d0e05;p=oweals%2Fu-boot.git board/linkstation/ide.c: Fix GCC 4.6 build warnings Fix: ide.c: In function 'ide_preinit': ide.c:69:21: warning: array subscript is above array bounds [-Warray-bounds] ide.c:69:21: warning: array subscript is above array bounds [-Warray-bounds] ide.c:70:17: warning: array subscript is above array bounds [-Warray-bounds] Signed-off-by: Wolfgang Denk Cc: Guennadi Liakhovetski Reviewed-by: Guennadi Liakhovetski --- diff --git a/board/linkstation/ide.c b/board/linkstation/ide.c index 568fdf5f2e..f3e3fce824 100644 --- a/board/linkstation/ide.c +++ b/board/linkstation/ide.c @@ -62,14 +62,16 @@ int ide_preinit (void) &ide_bus_offset32); ide_bus_offset[0] = ide_bus_offset32 & 0xfffffffe; ide_bus_offset[0] = pci_hose_bus_to_phys(&hose, - ide_bus_offset[0] & 0xfffffffe, - PCI_REGION_IO); - pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_2, - (u32 *) &ide_bus_offset[1]); - ide_bus_offset[1] &= 0xfffffffe; - ide_bus_offset[1] = pci_hose_bus_to_phys(&hose, - ide_bus_offset[1] & 0xfffffffe, - PCI_REGION_IO); + ide_bus_offset[0] & 0xfffffffe, + PCI_REGION_IO); + if (CONFIG_SYS_IDE_MAXBUS > 1) { + pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_2, + (u32 *) &ide_bus_offset[1]); + ide_bus_offset[1] &= 0xfffffffe; + ide_bus_offset[1] = pci_hose_bus_to_phys(&hose, + ide_bus_offset[1] & 0xfffffffe, + PCI_REGION_IO); + } } if (pci_find_device (PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8212, 0) != -1) {