diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 00:29:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 00:29:57 -0400 |
| commit | db21e578e551421d76641d72cb3f8296ed3f9e61 (patch) | |
| tree | 73968aeda7ed0051b5cff6950ad513011a3c7a5f /drivers/net/wireless/orinoco_pci.c | |
| parent | 6ed14254cb6e269030ff09bed8673473b7be0283 (diff) | |
| parent | df8ccb9bf1ca360581a94c2245efb9fa613fbb29 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/orinoco_pci.c')
| -rw-r--r-- | drivers/net/wireless/orinoco_pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c index df37b95607f..1c105f40f8d 100644 --- a/drivers/net/wireless/orinoco_pci.c +++ b/drivers/net/wireless/orinoco_pci.c @@ -161,7 +161,6 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, err = -EBUSY; goto fail_irq; } - orinoco_pci_setup_netdev(dev, pdev, 0); err = orinoco_pci_cor_reset(priv); if (err) { @@ -176,6 +175,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, } pci_set_drvdata(pdev, dev); + printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name, + pci_name(pdev)); return 0; @@ -204,7 +205,7 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) struct orinoco_private *priv = netdev_priv(dev); unregister_netdev(dev); - free_irq(dev->irq, dev); + free_irq(pdev->irq, dev); pci_set_drvdata(pdev, NULL); free_orinocodev(dev); pci_iounmap(pdev, priv->hw.iobase); |