---

yaml --- r: 40439 b: refs/heads/master c: 4708b5f h: refs/heads/master i: 40437: 1f7f2df 40435: f681dca 40431: d400ce8 v: v3
git-mirror · Oct 26, 2006 · 8f1f2fa · 8f1f2fa
1 parent 20485a5
commit 8f1f2fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01918d16c837485ceba92d48fb734cf520e61144
+refs/heads/master: 4708b5faf7c53bb4128d34267bdfe4b8c74b488a
diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c
@@ -95,7 +95,7 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base,
 	 * potential conflicts, just the most obvious ones.
 	 */
 	for (i = 0; i < MAX_IO_WIN; i++)
-		if ((s->io[i].res) &&
+		if ((s->io[i].res) && *base &&
 		    ((s->io[i].res->start & (align-1)) == *base))
 			return 1;
 	for (i = 0; i < MAX_IO_WIN; i++) {