]> err.no Git - linux-2.6/commitdiff
[PATCH] pcmcia: socket.functions starts with 1
authorDominik Brodowski <linux@dominikbrodowski.net>
Wed, 1 Mar 2006 13:04:52 +0000 (14:04 +0100)
committerDominik Brodowski <linux@dominikbrodowski.net>
Fri, 31 Mar 2006 15:05:25 +0000 (17:05 +0200)
socket.functions is the number of functions, and so must be one larger
than the maximum function number.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/ds.c

index 211aa84353fc9451502ab5de4a5be5d6fe278f38..16159e9d1b2b8072d70f58086bfd79351de60204 100644 (file)
@@ -588,8 +588,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
        p_dev->socket = s;
        p_dev->device_no = (s->device_count++);
        p_dev->func   = function;
-       if (s->functions < function)
-               s->functions = function;
+       if (s->functions <= function)
+               s->functions = function + 1;
 
        p_dev->dev.bus = &pcmcia_bus_type;
        p_dev->dev.parent = s->dev.dev;