From df3cb7f08a7308a372a253163ea227c668fe095a Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Thu, 13 Apr 2006 19:06:49 +0200 Subject: [PATCH] --- yaml --- r: 26151 b: refs/heads/master c: 2aff541c691b28cecb95ce710c367d16c0a84d8c h: refs/heads/master i: 26149: f1d265facc6386993985477a894593ddc5cb406f 26147: bb7b01aa3b2450e2d481b477ebd0e0d4577de4e4 26143: 866a8883cecffea856ec131de9a1b68fcc337c49 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pcmcia_resource.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 333657fe56b5..4e88820476cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80a55e923c76e022de298929e0c09bcca5c247d9 +refs/heads/master: 2aff541c691b28cecb95ce710c367d16c0a84d8c diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c index 2539c0b23062..cc3402c9b2c3 100644 --- a/trunk/drivers/pcmcia/pcmcia_resource.c +++ b/trunk/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