1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index df37b95607..1c105f40f8 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);