---

yaml --- r: 38206 b: refs/heads/master c: a8244b5 h: refs/heads/master v: v3
git-mirror · Oct 1, 2006 · 753233e · 753233e
1 parent 02249f6
commit 753233e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fbbac4bcb03033d325c71fc7273aa0b9c1d9a03
+refs/heads/master: a8244b564ccc46dabf2367008aecf2b380a9be8d
diff --git a/trunk/drivers/serial/serial_cs.c b/trunk/drivers/serial/serial_cs.c
@@ -81,8 +81,8 @@ module_param(buggy_uart, int, 0444);
 /* Table of multi-port card ID's */
 
 struct serial_quirk {
-	u_short manfid;
-	u_short prodid;
+	unsigned int manfid;
+	unsigned int prodid;
 	int multi;		/* 1 = multifunction, > 1 = # ports */
 };
 
@@ -645,9 +645,12 @@ static int serial_config(struct pcmcia_device * link)
 	if (first_tuple(link, tuple, parse) == CS_SUCCESS) {
 		info->manfid = parse->manfid.manf;
 		info->prodid = parse->manfid.card;
+
 		for (i = 0; i < ARRAY_SIZE(quirks); i++)
-			if ((info->manfid == quirks[i].manfid) &&
-			    (info->prodid == quirks[i].prodid)) {
+			if ((quirks[i].manfid == ~0 ||
+			     quirks[i].manfid == info->manfid) &&
+			    (quirks[i].prodid == ~0 ||
+			     quirks[i].prodid == info->prodid)) {
 				info->quirk = &quirks[i];
 				break;
 			}