From 4c893fb984c809cff4358fb19d96b05381a3927e Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 16 Sep 2006 20:53:05 +0100 Subject: [PATCH] --- yaml --- r: 38204 b: refs/heads/master c: 43549ad7a74e33947f3ba1756a7713086d32e97c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_cs.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f259d7c552c0..d105e262cc0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de6cc84f723ab4373d1f83e64771392d6f784c81 +refs/heads/master: 43549ad7a74e33947f3ba1756a7713086d32e97c diff --git a/trunk/drivers/serial/serial_cs.c b/trunk/drivers/serial/serial_cs.c index cbf260bc225d..82bb603fc1ae 100644 --- a/trunk/drivers/serial/serial_cs.c +++ b/trunk/drivers/serial/serial_cs.c @@ -95,7 +95,6 @@ static const struct multi_id multi_id[] = { { MANFID_INTEL, PRODID_INTEL_DUAL_RS232, 2 }, { MANFID_NATINST, PRODID_NATINST_QUAD_RS232, 4 } }; -#define MULTI_COUNT (sizeof(multi_id)/sizeof(struct multi_id)) struct serial_info { struct pcmcia_device *p_dev; @@ -622,13 +621,13 @@ static int serial_config(struct pcmcia_device * link) tuple->DesiredTuple = CISTPL_MANFID; if (first_tuple(link, tuple, parse) == CS_SUCCESS) { info->manfid = parse->manfid.manf; - info->prodid = le16_to_cpu(buf[1]); - for (i = 0; i < MULTI_COUNT; i++) + info->prodid = parse->manfid.card; + for (i = 0; i < ARRAY_SIZE(multi_id); i++) if ((info->manfid == multi_id[i].manfid) && - (parse->manfid.card == multi_id[i].prodid)) + (info->prodid == multi_id[i].prodid)) { + info->multi = multi_id[i].multi; break; - if (i < MULTI_COUNT) - info->multi = multi_id[i].multi; + } } /* Another check for dual-serial cards: look for either serial or