From 3bb795d6e712a82c46f0d66748ae8c305c8a66f9 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <maz@misterjones.org>
Date: Tue, 15 Jul 2008 15:26:15 +0200
Subject: [PATCH] --- yaml --- r: 102325 b: refs/heads/master c:
 002b90a1bf5fe9c8de7a8634403a685621841ff3 h: refs/heads/master i:   102323:
 d7348ac518cc84d81120181b9a5d0c876aae9440 v: v3

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

diff --git a/[refs] b/[refs]
index 6275c9134599..975b1935939c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d93c768e66d8c3970187c179a91a2553b077d9e8
+refs/heads/master: 002b90a1bf5fe9c8de7a8634403a685621841ff3
diff --git a/trunk/drivers/pcmcia/cistpl.c b/trunk/drivers/pcmcia/cistpl.c
index 9fcff0c33619..65129b54eb09 100644
--- a/trunk/drivers/pcmcia/cistpl.c
+++ b/trunk/drivers/pcmcia/cistpl.c
@@ -1490,7 +1490,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
 	    ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
 	    reserved++;
     }
-    if ((count) || (reserved > 5) ||
+    if ((count == MAX_TUPLES) || (reserved > 5) ||
 	((!dev_ok || !ident_ok) && (count > 10)))
 	count = 0;