From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Tue, 28 Nov 2006 02:03:48 +0000 (-0500)
Subject: [PATCH] pcmcia: allow for four multifunction subdevices
X-Git-Tag: v2.6.20-rc2~6^2~13^2~6^2~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c;p=linux-2.6-omap-h63xx.git

[PATCH] pcmcia: allow for four multifunction subdevices

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>
---

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index da7ceb523b4..6572b3850e5 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -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);