patch-2.3.13 linux/drivers/block/cpqarray.c

• Lines: 18
• Date: Thu Aug 5 15:04:42 1999
• Orig file: v2.3.12/linux/drivers/block/cpqarray.c
• Orig date: Thu Jul 8 15:42:19 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/block/cpqarray.c linux/drivers/block/cpqarray.c
@@ -631,7 +631,7 @@
 	irq = pdev->irq;
 
 	for(i=0; i<6; i++)
-		addr[i] = pdev->base_address[i];
+		addr[i] = pdev->resource[i].flags;
 
 	(void) pcibios_read_config_word(bus, device_fn,
 					PCI_COMMAND,&command);
@@ -665,7 +665,7 @@
 	 */
 	for(i=0; i<6; i++)
 		if (!(addr[i] & 0x1)) {
-			c->paddr = addr[i];
+			c->paddr = pdev->resource[i].start;
 			break;
 		}
 	c->vaddr = remap_pci_mem(c->paddr, 128);