[PATCH] pcmcia: fix oops in static mapping case
authorDominik Brodowski <linux@dominikbrodowski.net>
Thu, 13 Apr 2006 17:06:49 +0000 (19:06 +0200)
committerDominik Brodowski <linux@dominikbrodowski.net>
Fri, 21 Apr 2006 22:49:17 +0000 (00:49 +0200)
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>
drivers/pcmcia/pcmcia_resource.c

index 2539c0b..cc3402c 100644 (file)
@@ -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