diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-27 19:28:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 21:03:18 -0400 |
commit | 3c29976a6469b81a7858812dc2d4b8430d74004a (patch) | |
tree | 2a8baf9ad5ffe36b55fd5c0b9f8fcf0e2c67e2f6 /drivers/pcmcia/rsrc_mgr.c | |
parent | 22916638b124e859b595099bd0c86a1e09e767fb (diff) |
[PATCH] pcmcia: mark parent bridge windows as resources available for PCMCIA devices
Automatically mark the parent PCI-PCI bridge windows as resources available
for PCMCIA usage.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
-rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index b6843f8d300d..b9269e66281a 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
@@ -72,7 +72,7 @@ int pcmcia_adjust_resource_info(adjust_t *adj) | |||
72 | /* you can't use the old interface if the new | 72 | /* you can't use the old interface if the new |
73 | * one was used before */ | 73 | * one was used before */ |
74 | spin_lock_irqsave(&s->lock, flags); | 74 | spin_lock_irqsave(&s->lock, flags); |
75 | if ((s->resource_setup_done) && | 75 | if ((s->resource_setup_new) && |
76 | !(s->resource_setup_old)) { | 76 | !(s->resource_setup_old)) { |
77 | spin_unlock_irqrestore(&s->lock, flags); | 77 | spin_unlock_irqrestore(&s->lock, flags); |
78 | continue; | 78 | continue; |