wl1271: Fix memory leaks on driver initialization

[safe/jmp/linux-2.6] / drivers / net / wireless / orinoco / orinoco_pci.c

diff --git a/drivers/net/wireless/orinoco/orinoco_pci.c b/drivers/net/wireless/orinoco/orinoco_pci.c
index 12b9c6a..bda5317 100644 (file)
--- a/drivers/net/wireless/orinoco/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco/orinoco_pci.c
@@ -116,7 +116,6 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
        int err;
        struct orinoco_private *priv;
        struct orinoco_pci_card *card;
-       struct net_device *dev;
        void __iomem *hermes_io;
 
        err = pci_enable_device(pdev);
@@ -147,14 +146,12 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
                goto fail_alloc;
        }
 
-       dev = priv->ndev;
        card = priv->card;
-       SET_NETDEV_DEV(dev, &pdev->dev);
 
        hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING);
 
        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
-                         dev->name, priv);
+                         DRIVER_NAME, priv);
        if (err) {
                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
                err = -EBUSY;
@@ -167,15 +164,19 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
                goto fail;
        }
 
-       err = register_netdev(dev);
+       err = orinoco_init(priv);
        if (err) {
-               printk(KERN_ERR PFX "Cannot register network device\n");
+               printk(KERN_ERR PFX "orinoco_init() failed\n");
+               goto fail;
+       }
+
+       err = orinoco_if_add(priv, 0, 0);
+       if (err) {
+               printk(KERN_ERR PFX "orinoco_if_add() failed\n");
                goto fail;
        }
 
        pci_set_drvdata(pdev, priv);
-       printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,
-              pci_name(pdev));
 
        return 0;
 
@@ -201,9 +202,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
 static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev)
 {
        struct orinoco_private *priv = pci_get_drvdata(pdev);
-       struct net_device *dev = priv->ndev;
 
-       unregister_netdev(dev);
+       orinoco_if_del(priv);
        free_irq(pdev->irq, priv);
        pci_set_drvdata(pdev, NULL);
        free_orinocodev(priv);
@@ -212,7 +212,7 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev)
        pci_disable_device(pdev);
 }
 
-static struct pci_device_id orinoco_pci_id_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(orinoco_pci_id_table) = {
        /* Intersil Prism 3 */
        {0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,},
        /* Intersil Prism 2.5 */