From ca1a28d16a88752fe1dce5209a3cb3214e6339fc Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Mon, 19 Oct 2009 00:04:25 +0200
Subject: [PATCH] --- yaml --- r: 167824 b: refs/heads/master c:
 c5e09528beb2c345403a64205db3b5aca568fec0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 300dfaf2049e..ba4d079cf919 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84897fc0524d7cbfc81d0bdf9f92ade6e3c3816b
+refs/heads/master: c5e09528beb2c345403a64205db3b5aca568fec0
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
index c70fb3bc0e0f..f5b7079f13d3 100644
--- a/trunk/drivers/pcmcia/ds.c
+++ b/trunk/drivers/pcmcia/ds.c
@@ -583,7 +583,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
 
 	if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL, CISTPL_VERS_1,
 			       vers1)) {
-		for (i=0; i < vers1->ns; i++) {
+		for (i = 0; i < min_t(unsigned int, 4, vers1->ns); i++) {
 			char *tmp;
 			unsigned int length;