summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-04-13 19:06:49 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2006-04-22 00:49:17 +0200
commit2aff541c691b28cecb95ce710c367d16c0a84d8c (patch)
tree349642ad416a2948e7b0ed6048ffcdb0917b4a99 /drivers/pcmcia
parent80a55e923c76e022de298929e0c09bcca5c247d9 (diff)
downloadlinux-2aff541c691b28cecb95ce710c367d16c0a84d8c.tar.gz
linux-2aff541c691b28cecb95ce710c367d16c0a84d8c.tar.bz2
linux-2aff541c691b28cecb95ce710c367d16c0a84d8c.zip
[PATCH] pcmcia: fix oops in static mapping case
As static maps do not have IO resources, this setting oopses. However, as we do not ever read this value, we can safely remove it. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 2539c0b23062..cc3402c9b2c3 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -88,7 +88,6 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base,
}
if ((s->features & SS_CAP_STATIC_MAP) && s->io_offset) {
*base = s->io_offset | (*base & 0x0fff);
- s->io[0].res->flags = (s->io[0].res->flags & ~IORESOURCE_BITS) | (attr & IORESOURCE_BITS);
return 0;
}
/* Check for an already-allocated window that must conflict with