diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-11-27 21:03:48 -0500 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-04 20:09:18 -0500 |
| commit | 6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c (patch) | |
| tree | 5147dcddcb5bd58bf5be2e3d96a2c10c0e76faa8 /drivers/pcmcia | |
| parent | 9374074f9b8bfe15bd5860019d07d967507c2bb6 (diff) | |
| download | linux-3.10-6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c.tar.gz linux-3.10-6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c.tar.bz2 linux-3.10-6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c.zip | |
[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>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/ds.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |