Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[sfrench/cifs-2.6.git] / drivers / net / eepro100.c

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 9afa47edfc5850e65309530f68e8dbab2f437656..1548a80f917d52650feb344369ab065b16122a4f 100644 (file)
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -622,6 +622,7 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
        int size;
        void *tx_ring_space;
        dma_addr_t tx_ring_dma;
+       DECLARE_MAC_BUF(mac);
 
        size = TX_RING_SIZE * sizeof(struct TxFD) + sizeof(struct speedo_stats);
        tx_ring_space = pci_alloc_consistent(pdev, size, &tx_ring_dma);
@@ -635,7 +636,6 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
                return -1;
        }
 
-       SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        if (dev->mem_start > 0)
@@ -706,12 +706,8 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
        else
                product = pci_name(pdev);
 
-       printk(KERN_INFO "%s: %s, ", dev->name, product);
-
-       for (i = 0; i < 5; i++)
-               printk("%2.2X:", dev->dev_addr[i]);
-       printk("%2.2X, ", dev->dev_addr[i]);
-       printk("IRQ %d.\n", pdev->irq);
+       printk(KERN_INFO "%s: %s, %s, IRQ %d.\n", dev->name, product,
+                  print_mac(mac, dev->dev_addr), pdev->irq);
 
        sp = netdev_priv(dev);
 
@@ -2292,10 +2288,15 @@ static int eepro100_resume(struct pci_dev *pdev)
        struct net_device *dev = pci_get_drvdata (pdev);
        struct speedo_private *sp = netdev_priv(dev);
        void __iomem *ioaddr = sp->regs;
+       int rc;
 
        pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
-       pci_enable_device(pdev);
+
+       rc = pci_enable_device(pdev);
+       if (rc)
+               return rc;
+
        pci_set_master(pdev);
 
        if (!netif_running(dev))