From 17f65f814fc6144e61b5d19f8e0627cd781486c2 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 9 Jan 2008 22:16:58 -0500 Subject: hostap_cs: don't match revisions in presense of the MAC chip name If the third PCMCIA ID string specifies the MAC chip, the fourth ID string doesn't need to be matched. Even if it's different, it will be compatible with the driver. This ensures that other different revisions of the card will be supported. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville --- drivers/net/wireless/hostap/hostap_cs.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 877d3bdd37a0..07593803065a 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c @@ -845,15 +845,13 @@ static struct pcmcia_device_id hostap_cs_ids[] = { 0x4b801a17), PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6), - PCMCIA_DEVICE_PROD_ID1234( + PCMCIA_DEVICE_PROD_ID123( "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", - "Eval-RevA", - 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e), + 0x4b801a17, 0x6345a0bf, 0xc9049a39), /* D-Link DWL-650 Rev. P1; manfid 0x000b, 0x7110 */ - PCMCIA_DEVICE_PROD_ID1234( + PCMCIA_DEVICE_PROD_ID123( "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10", - "A3", - 0x1a424a1c, 0x6ea57632, 0xdd97a26b, 0x56b21f52), + 0x1a424a1c, 0x6ea57632, 0xdd97a26b), PCMCIA_DEVICE_PROD_ID123( "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", 0xe6ec52ce, 0x08649af2, 0x4b74baa0), @@ -890,10 +888,9 @@ static struct pcmcia_device_id hostap_cs_ids[] = { PCMCIA_DEVICE_PROD_ID123( "corega", "WL PCCL-11", "ISL37300P", 0xa21501a, 0x59868926, 0xc9049a39), - PCMCIA_DEVICE_PROD_ID1234( + PCMCIA_DEVICE_PROD_ID123( "The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P", - "RevA", - 0xa5f472c2, 0x9c05598d, 0xc9049a39, 0x57a66194), + 0xa5f472c2, 0x9c05598d, 0xc9049a39), PCMCIA_DEVICE_NULL }; MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids); -- cgit v1.2.3