From: Dominik Brodowski Date: Thu, 13 Apr 2006 17:06:49 +0000 (+0200) Subject: [PATCH] pcmcia: fix oops in static mapping case X-Git-Tag: v2.6.17-rc3~28^2~2 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=2aff541c691b28cecb95ce710c367d16c0a84d8c;p=powerpc.git [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 --- diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 2539c0b230..cc3402c9b2 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