The following commit has been merged in the linux branch: commit c5e09528beb2c345403a64205db3b5aca568fec0 Author: Dominik Brodowski linux@dominikbrodowski.net Date: Mon Oct 19 00:04:25 2009 +0200

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 c70fb3b..f5b7079 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;