Skip to content

L
linux
Commit e7f52e4c authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

parents 249b94a5 10487fbd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/net/sis190.c
View file @ e7f52e4c
...@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, ...@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
goto out; goto out;
} }
pci_set_drvdata(pdev, dev);
tp = netdev_priv(dev); tp = netdev_priv(dev);
ioaddr = tp->mmio_addr; ioaddr = tp->mmio_addr;
...@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, ...@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
if (rc < 0) if (rc < 0)
goto err_remove_mii; goto err_remove_mii;
pci_set_drvdata(pdev, dev);
net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), " net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), "
"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
pci_name(pdev), sis_chip_info[ent->driver_data].name, pci_name(pdev), sis_chip_info[ent->driver_data].name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7