vserver 1.9.3

[linux-2.6.git] / drivers / atm / ambassador.c

diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index c26a12e..9be4013 100644 (file)
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -1126,7 +1126,7 @@ static int amb_open (struct atm_vcc * atm_vcc)
          } else {
            r = round_up;
          }
-         error = make_rate (pcr, r, &tx_rate_bits, 0);
+         error = make_rate (pcr, r, &tx_rate_bits, NULL);
          tx_vc_bits = TX_UBR_CAPPED;
          tx_frame_bits = TX_FRAME_CAPPED;
        }
@@ -1333,7 +1333,7 @@ static void amb_close (struct atm_vcc * atm_vcc) {
       PRINTK (KERN_ERR, "%s vcc=%p rxer[vci]=%p",
              "arghhh! we're going to die!",
              vcc, dev->rxer[vci]);
-    dev->rxer[vci] = 0;
+    dev->rxer[vci] = NULL;
     while (command_do (dev, &cmd))
       schedule();
     
@@ -2291,11 +2291,10 @@ static int __init do_pci_device(struct pci_dev *pci_dev)
 
        // read resources from PCI configuration space
        u8 irq = pci_dev->irq;
-       u32 * membase = bus_to_virt (pci_resource_start (pci_dev, 0));
-       u32 iobase = pci_resource_start (pci_dev, 1);
 
        PRINTD (DBG_INFO, "found Madge ATM adapter (amb) at"
-               " IO %x, IRQ %u, MEM %p", iobase, irq, membase);
+               " IO %x, IRQ %u, MEM %p", pci_resource_start(pci_dev, 1),
+               irq, bus_to_virt(pci_resource_start(pci_dev, 0)));
 
        // check IO region
        err = pci_request_region(pci_dev, 1, DEV_LABEL);