From: Dominik Brodowski Date: Wed, 28 Sep 2005 17:29:59 +0000 (+0200) Subject: [PATCH] pcmcia: only start up nonstatic sockets if both mem and io are available X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=54bb5675a6e966a58755ac44e3407f8ec2272b82;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [PATCH] pcmcia: only start up nonstatic sockets if both mem and io are available 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 --- diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 7e1b7fcd8333..f9a5c70284b5 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -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;