diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-11-28 03:03:48 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-05 02:09:18 +0100 |
| commit | 6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c (patch) | |
| tree | 5147dcddcb5bd58bf5be2e3d96a2c10c0e76faa8 /drivers/pcmcia/ds.c | |
| parent | [PATCH] pcmcia: handle __copy_from_user() return value in ioctl (diff) | |
| download | linux-6cf5be5112ecc5b0bded73bd2a64c1d46e4f6b8c.tar.xz linux-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/ds.c')
| -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 da7ceb523b48..6572b3850e55 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); |