From 8f1f2fa96d20111b5f4c844358ed84d15d99e450 Mon Sep 17 00:00:00 2001
From: Kaustav Majumdar <kaustav.majumdar@wipro.com>
Date: Fri, 20 Oct 2006 14:44:09 -0700
Subject: [PATCH] --- yaml --- r: 40439 b: refs/heads/master c:
 4708b5faf7c53bb4128d34267bdfe4b8c74b488a h: refs/heads/master i:   40437:
 1f7f2dfd63e886b2f8361d6069e74cd106ee99f8   40435:
 f681dcaa79d9b2f48d47d1b9b90daa0f1c118a94   40431:
 d400ce8aa1a4cae8d04b59d9c414755e859c49ad v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pcmcia/pcmcia_resource.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 40cee9034991..fb35e10dacd4 100644
--- 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
index 74cebd424032..b9201c2ec38b 100644
--- 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++) {