patch-2.3.99-pre7 linux/drivers/atm/ambassador.c

Next file: linux/drivers/atm/fore200e.c
Previous file: linux/drivers/acorn/block/fd1772.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/atm/ambassador.c linux/drivers/atm/ambassador.c
@@ -2372,8 +2372,8 @@
     
     // read resources from PCI configuration space
     u8 irq = pci_dev->irq;
-    u32 * membase = bus_to_virt (pci_dev->resource[0].start);
-    u32 iobase = pci_dev->resource[1].start;
+    u32 * membase = bus_to_virt (pci_resource_start (pci_dev, 0));
+    u32 iobase = pci_resource_start (pci_dev, 1);
     
     void setup_dev (void) {
       unsigned char pool;
@@ -2419,6 +2419,9 @@
     void setup_pci_dev (void) {
       unsigned char lat;
       
+      /* XXX check return value */
+      pci_enable_device (pci_dev);
+
       // enable bus master accesses
       pci_set_master (pci_dev);
       

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