forked from Minki/linux
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
This commit is contained in:
commit
e7f52e4c43
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user