[RFC PATCH 6/8] pcmcia: fix oops in static mapping case

Dominik Brodowski linux at dominikbrodowski.net
Tue Apr 18 13:21:18 EDT 2006


Please review these patches which I intend to push upstream for 2.6.17 soon.
Thanks,
	Dominik

From: Dominik Brodowski <linux at dominikbrodowski.net>
Subject: [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 at dominikbrodowski.net>

---

 drivers/pcmcia/pcmcia_resource.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

26cf31d7461fb2ec64372a462ab99d8208876877
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 2539c0b..cc3402c 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -88,7 +88,6 @@ static int alloc_io_space(struct pcmcia_
 	}
 	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
-- 
1.2.6




More information about the linux-pcmcia mailing list