Skip to content

Commit

Permalink
sis190: early setting of the pci driver private data
Browse files Browse the repository at this point in the history
Below this point, the error path will proceed through
sis190_release_board(). It will happily oops if
pci_set_drvdata() has not been issued.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
  • Loading branch information
Francois Romieu committed Feb 16, 2006
1 parent 26d451b commit 10487fb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/sis190.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 10487fb

Please sign in to comment.