]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] pcmcia: only start up nonstatic sockets if both mem and io are available
authorDominik Brodowski <linux@dominikbrodowski.net>
Wed, 28 Sep 2005 17:29:59 +0000 (19:29 +0200)
committerDominik Brodowski <linux@dominikbrodowski.net>
Wed, 28 Sep 2005 18:11:30 +0000 (20:11 +0200)
Only start up nonstatic sockets if both IO and MEM resources are available.
Thanks to Russell King and Matthew Wilcox for tracking this down.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/rsrc_nonstatic.c

index 7e1b7fcd8333ddc110cd9c081281724153252a7c..f9a5c70284b5a8901a7afbd86d07f39b1330978b 100644 (file)
@@ -817,7 +817,7 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
 
        /* if we got at least one of IO, and one of MEM, we can be glad and
         * activate the PCMCIA subsystem */
-       if (done & (IORESOURCE_MEM | IORESOURCE_IO))
+       if (done == (IORESOURCE_MEM | IORESOURCE_IO))
                s->resource_setup_done = 1;
 
        return 0;