diff options
| -rw-r--r-- | drivers/net/wireless/airport.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco_cs.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco_pci.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco_plx.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco_tmd.c | 4 |
7 files changed, 16 insertions, 9 deletions
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index de2b3a4b024f..a1dc2a196087 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c @@ -149,7 +149,7 @@ airport_detach(struct macio_dev *mdev) ssleep(1); macio_set_drvdata(mdev, NULL); - free_netdev(dev); + free_orinocodev(dev); return 0; } @@ -211,7 +211,7 @@ airport_attach(struct macio_dev *mdev, const struct of_match *match) if (macio_request_resource(mdev, 0, "airport")) { printk(KERN_ERR PFX "can't request IO resource !\n"); - free_netdev(dev); + free_orinocodev(dev); return -EBUSY; } diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 0553429ef67e..1417553a7a2b 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -2398,6 +2398,11 @@ struct net_device *alloc_orinocodev(int sizeof_card, } +void free_orinocodev(struct net_device *dev) +{ + free_netdev(dev); +} + /********************************************************************/ /* Wireless extensions */ /********************************************************************/ @@ -4131,6 +4136,7 @@ static void show_rx_frame(struct orinoco_rxframe_hdr *frame) /********************************************************************/ EXPORT_SYMBOL(alloc_orinocodev); +EXPORT_SYMBOL(free_orinocodev); EXPORT_SYMBOL(__orinoco_up); EXPORT_SYMBOL(__orinoco_down); diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h index 08ddb16148c8..13f0b54a2e1c 100644 --- a/drivers/net/wireless/orinoco.h +++ b/drivers/net/wireless/orinoco.h @@ -107,6 +107,7 @@ extern int orinoco_debug; extern struct net_device *alloc_orinocodev(int sizeof_card, int (*hard_reset)(struct orinoco_private *)); +extern void free_orinocodev(struct net_device *dev); extern int __orinoco_up(struct net_device *dev); extern int __orinoco_down(struct net_device *dev); extern int orinoco_stop(struct net_device *dev); diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 822d6e9ce37c..e5827c5878a5 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c @@ -235,7 +235,7 @@ static void orinoco_cs_detach(dev_link_t *link) dev); unregister_netdev(dev); } - free_netdev(dev); + free_orinocodev(dev); } /* orinoco_cs_detach */ /* diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c index 8cc62f081759..676d022883fa 100644 --- a/drivers/net/wireless/orinoco_pci.c +++ b/drivers/net/wireless/orinoco_pci.c @@ -254,7 +254,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, if (dev->irq) free_irq(dev->irq, dev); - free_netdev(dev); + free_orinocodev(dev); } if (pci_ioaddr) @@ -279,7 +279,7 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) iounmap(priv->hw.iobase); pci_set_drvdata(pdev, NULL); - free_netdev(dev); + free_orinocodev(dev); pci_disable_device(pdev); } diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c index 6f7154a4daf5..7e162cd5495d 100644 --- a/drivers/net/wireless/orinoco_plx.c +++ b/drivers/net/wireless/orinoco_plx.c @@ -279,7 +279,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, fail: free_irq(dev->irq, dev); fail_irq: - free_netdev(dev); + free_orinocodev(dev); fail_alloc: pci_iounmap(pdev, mem); fail_map: @@ -304,7 +304,7 @@ static void __devexit orinoco_plx_remove_one(struct pci_dev *pdev) pci_set_drvdata(pdev, NULL); - free_netdev(dev); + free_orinocodev(dev); release_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3)); diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c index 60fa8df0fc8a..7c759e6cf550 100644 --- a/drivers/net/wireless/orinoco_tmd.c +++ b/drivers/net/wireless/orinoco_tmd.c @@ -164,7 +164,7 @@ out5: out4: pci_iounmap(pdev, mem); out3: - free_netdev(dev); + free_orinocodev(dev); out2: release_region(pccard_ioaddr, pccard_iolen); out: @@ -188,7 +188,7 @@ static void __devexit orinoco_tmd_remove_one(struct pci_dev *pdev) pci_set_drvdata(pdev, NULL); - free_netdev(dev); + free_orinocodev(dev); release_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2)); |
