---

yaml --- r: 3819 b: refs/heads/master c: 57b6281 h: refs/heads/master i: 3817: caa8465 3815: 4c9dda8 v: v3
git-mirror · Jun 28, 2005 · 4e7c666 · 4e7c666
1 parent 9edd875
commit 4e7c666
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a8ceafce5f1e68c28c7ba52fd7e72ab0008eb46
+refs/heads/master: 57b6281cea59639cce995745f1dc42fe9da2c533
diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c
@@ -89,6 +89,7 @@ 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].Attributes = attr;
 		return 0;
 	}
 	/* Check for an already-allocated window that must conflict with