]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] pcmcia: allow for four multifunction subdevices
authorDominik Brodowski <linux@dominikbrodowski.net>
Tue, 28 Nov 2006 02:03:48 +0000 (21:03 -0500)
committerDominik Brodowski <linux@dominikbrodowski.net>
Tue, 5 Dec 2006 01:09:18 +0000 (20:09 -0500)
Some Elan serial cards allow for four (independent) multifunction
subdevices. Teach the PCMCIA core to deal with such devices.

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

index da7ceb523b4882bf3e4ad403862002399ecc1f14..6572b3850e554385cab6c2cb3c59da86fc3733f5 100644 (file)
@@ -529,8 +529,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
 
        mutex_lock(&device_add_lock);
 
-       /* max of 2 devices per card */
-       if (s->device_count == 2)
+       /* max of 4 devices per card */
+       if (s->device_count == 4)
                goto err_put;
 
        p_dev = kzalloc(sizeof(struct pcmcia_device), GFP_KERNEL);