diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-01 08:04:52 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:05:25 -0500 |
commit | 552dc85dfed6b6a74a3a01c4ba277ee09797dd0a (patch) | |
tree | 9b802fac801cf74618b2ed3ae7f51b2a585123d7 /drivers/pcmcia/ds.c | |
parent | 159fe8a8358c7012d4f1fdacfcf69009ea15b52e (diff) |
[PATCH] pcmcia: socket.functions starts with 1
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>
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 211aa84353fc..16159e9d1b2b 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -588,8 +588,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f | |||
588 | p_dev->socket = s; | 588 | p_dev->socket = s; |
589 | p_dev->device_no = (s->device_count++); | 589 | p_dev->device_no = (s->device_count++); |
590 | p_dev->func = function; | 590 | p_dev->func = function; |
591 | if (s->functions < function) | 591 | if (s->functions <= function) |
592 | s->functions = function; | 592 | s->functions = function + 1; |
593 | 593 | ||
594 | p_dev->dev.bus = &pcmcia_bus_type; | 594 | p_dev->dev.bus = &pcmcia_bus_type; |
595 | p_dev->dev.parent = s->dev.dev; | 595 | p_dev->dev.parent = s->dev.dev; |