diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-09-28 19:29:59 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-09-28 20:11:30 +0200 |
| commit | 54bb5675a6e966a58755ac44e3407f8ec2272b82 (patch) | |
| tree | d613e03fbe389509fc8086c262b1773ba56874cd /drivers/pcmcia | |
| parent | 1146bc743e074760ef0dd08b3457f35a68069a54 (diff) | |
| download | linux-54bb5675a6e966a58755ac44e3407f8ec2272b82.tar.gz linux-54bb5675a6e966a58755ac44e3407f8ec2272b82.tar.bz2 linux-54bb5675a6e966a58755ac44e3407f8ec2272b82.zip | |
[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 <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |