Re: 2.4.5-acX, airo_cs

[Jeff Garzik]

This is a multi-part message in MIME format.
--------------1E781ABD88D71DCC759619AA
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

PALFFY Daniel wrote:
> --- linux/drivers/net/wireless/airo.c~  Sat Jun 30 22:37:10 2001
> +++ linux/drivers/net/wireless/airo.c   Sat Jun 30 22:37:33 2001
> @@ -2988,9 +2988,7 @@
>          * fails with an error other than -ENODEV, instead of proceeding,
>          * if ISA devs are present.
>          */
> -       if (have_isa_dev)
> -               return 0;
> -       return rc;
> +       return 0;
>  }

Thanks, I applied this patch manually, with a comment as well.  Here is
what I have (attached).

-- 
Jeff Garzik      | Andre the Giant has a posse.
Building 1024    |
MandrakeSoft     |
--------------1E781ABD88D71DCC759619AA
Content-Type: text/plain; charset=us-ascii;
 name="airo.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="airo.patch"

Index: drivers/net/wireless/airo.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_4/drivers/net/wireless/Attic/airo.c,v
retrieving revision 1.1.1.9
diff -u -r1.1.1.9 airo.c
--- drivers/net/wireless/airo.c	2001/06/30 05:24:30	1.1.1.9
+++ drivers/net/wireless/airo.c	2001/06/30 23:59:28
@@ -2984,14 +2984,9 @@
 	printk( KERN_INFO "airo:  Finished probing for PCI adapters\n" );
 #endif
 
-	/* arguably, we should clean up and error exit if pci_module_init
-	 * fails with an error other than -ENODEV, instead of proceeding,
-	 * if ISA devs are present.
+	/* Always exit with success, as we are a library module
+	 * as well as a driver module
 	 */
-	if (have_isa_dev)
-		return 0;
-	if (rc && (rc != -ENODEV))
-		return rc;
 	return 0;
 }
 

--------------1E781ABD88D71DCC759619AA--