From linux-kernel@vger.kernel.org Sun Dec 28 14:34:44 2003 Date: Sun, 07 Dec 2003 18:27:13 +0000 From: Linux Kernel Mailing List To: bk-commits-24@vger.kernel.org Subject: [wireless airo] Fix PCI registration ChangeSet 1.1136.73.6, 2003/12/07 13:27:13-05:00, achirica@telefonica.net [wireless airo] Fix PCI registration # This patch includes the following deltas: # ChangeSet 1.1136.73.5 -> 1.1136.73.6 # drivers/net/wireless/airo.c 1.61 -> 1.62 # airo.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff -ruN linux-2.4.23.mine/drivers/net/wireless/airo.c linux-2.4.23/drivers/net/wireless/airo.c --- linux-2.4.23.mine/drivers/net/wireless/airo.c 2003-12-28 22:32:51.418220092 -0700 +++ linux-2.4.23/drivers/net/wireless/airo.c 2003-12-28 22:33:04.226400129 -0700 @@ -1034,7 +1034,6 @@ #define FLAG_802_11 7 #define FLAG_PENDING_XMIT 9 #define FLAG_PENDING_XMIT11 10 -#define FLAG_PCI 11 #define JOB_MASK 0x1ff0000 #define JOB_DIE 16 #define JOB_XMIT 17 @@ -4639,7 +4638,6 @@ return -ENODEV; pci_set_drvdata(pdev, dev); - set_bit (FLAG_PCI, &((struct airo_info *)dev->priv)->flags); return 0; } @@ -4669,7 +4667,7 @@ #ifdef CONFIG_PCI printk( KERN_INFO "airo: Probing for PCI adapters\n" ); - pci_module_init(&airo_driver); + pci_register_driver(&airo_driver); printk( KERN_INFO "airo: Finished probing for PCI adapters\n" ); #endif @@ -4681,22 +4679,15 @@ static void __exit airo_cleanup_module( void ) { - int is_pci = 0; while( airo_devices ) { printk( KERN_INFO "airo: Unregistering %s\n", airo_devices->dev->name ); -#ifdef CONFIG_PCI - if (test_bit(FLAG_PCI, &((struct airo_info *)airo_devices->dev->priv)->flags)) - is_pci = 1; -#endif stop_airo_card( airo_devices->dev, 1 ); } remove_proc_entry("aironet", proc_root_driver); - if (is_pci) { #ifdef CONFIG_PCI - pci_unregister_driver(&airo_driver); + pci_unregister_driver(&airo_driver); #endif - } } #ifdef WIRELESS_EXT