summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-17 16:11:47 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-17 16:11:47 -0500
commite7f52e4c43ba5d59a08c8482b5cf1f20f1ce7664 (patch)
tree53ac15aeb187cfea9dcb2a63b8601ae8c0e48980
parent249b94a5f7dafe7a3963061eddad9c1bd5d67328 (diff)
parent10487fbd74f2f9c9b5fb2d77efd50eab48db191a (diff)
downloadop-kernel-dev-e7f52e4c43ba5d59a08c8482b5cf1f20f1ce7664.zip
op-kernel-dev-e7f52e4c43ba5d59a08c8482b5cf1f20f1ce7664.tar.gz
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
-rw-r--r--drivers/net/sis190.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b420182..ed4bc91 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
goto out;
}
+ pci_set_drvdata(pdev, dev);
+
tp = netdev_priv(dev);
ioaddr = tp->mmio_addr;
@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
if (rc < 0)
goto err_remove_mii;
- pci_set_drvdata(pdev, dev);
-
net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), "
"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
pci_name(pdev), sis_chip_info[ent->driver_data].name,
OpenPOWER on IntegriCloud