patch-2.4.0-test2 linux/drivers/ide/trm290.c

Next file: linux/drivers/ide/via82cxxx.c
Previous file: linux/drivers/ide/sis5513.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/ide/trm290.c linux/drivers/ide/trm290.c
@@ -224,10 +224,10 @@
 	struct pci_dev *dev = hwif->pci_dev;
 
 	hwif->chipset = ide_trm290;
-	cfgbase = dev->resource[4].start;
+	cfgbase = pci_resource_start(dev, 4);
 	if ((dev->class & 5) && cfgbase)
 	{
-		hwif->config_data = cfgbase & PCI_BASE_ADDRESS_IO_MASK;
+		hwif->config_data = cfgbase;
 		printk("TRM290: chip config base at 0x%04lx\n", hwif->config_data);
 	} else {
 		hwif->config_data = 0x3df0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)