ipg: balance locking in irq handler

[linux-2.6-omap-h63xx.git] / drivers / net / tlan.c

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 106dc1ef0acb95c37e3c8d21f2721858239c8585..c99ce74a7aff7251c3821314fab0e43be38ffd2f 100644 (file)
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -533,7 +533,6 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
        struct net_device  *dev;
        TLanPrivateInfo    *priv;
-       u8                 pci_rev;
        u16                device_id;
        int                reg, rc = -ENODEV;
 
@@ -557,7 +556,6 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                rc = -ENOMEM;
                goto err_out_regions;
        }
-       SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        priv = netdev_priv(dev);
@@ -577,8 +575,6 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                        goto err_out_free_dev;
                }
 
-               pci_read_config_byte ( pdev, PCI_REVISION_ID, &pci_rev);
-
                for ( reg= 0; reg <= 5; reg ++ ) {
                        if (pci_resource_flags(pdev, reg) & IORESOURCE_IO) {
                                pci_io_base = pci_resource_start(pdev, reg);
@@ -595,7 +591,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
                dev->base_addr = pci_io_base;
                dev->irq = pdev->irq;
-               priv->adapterRev = pci_rev;
+               priv->adapterRev = pdev->revision;
                pci_set_master(pdev);
                pci_set_drvdata(pdev, dev);