From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sun, 18 Oct 2009 22:04:25 +0000 (+0200)
Subject: pcmcia: do not try to store more than 4 version strings
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5e09528beb2c345403a64205db3b5aca568fec0;p=mv-sheeva.git

pcmcia: do not try to store more than 4 version strings

... for struct pcmcia_device only provides for 4 anyway.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index c70fb3bc0e0..f5b7079f13d 100644
--- a/drivers/pcmcia/ds.c
+++ b/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;