summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2009-10-19 00:04:25 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2009-10-19 00:35:29 +0200
commitc5e09528beb2c345403a64205db3b5aca568fec0 (patch)
tree34cbf0a75e0e4776e5fca999493d3cc5d812b46f /drivers/pcmcia
parent84897fc0524d7cbfc81d0bdf9f92ade6e3c3816b (diff)
downloadlinux-c5e09528beb2c345403a64205db3b5aca568fec0.tar.bz2
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>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/ds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index c70fb3bc0e0f..f5b7079f13d3 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;