diff options
| author | imp <imp@FreeBSD.org> | 2003-04-10 04:11:15 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-04-10 04:11:15 +0000 |
| commit | 1281a2b1fe44a3fa1b25f088ef7c814e3e98153b (patch) | |
| tree | 14d50f2d7c5440e4e47af8a899f1fa65428a7135 | |
| parent | 55f9c171d47c643cc16f4434f0f2e6277e9a4b33 (diff) | |
| download | FreeBSD-src-1281a2b1fe44a3fa1b25f088ef7c814e3e98153b.zip FreeBSD-src-1281a2b1fe44a3fa1b25f088ef7c814e3e98153b.tar.gz | |
In [bsd-nomads:16650] shibagaki-san presented an example product id of
0 in a problem that is being discussed. That means that the test for
product != 0 may cause problems. Looking at pccarddevs (which i
should have done earlier) we see:
product BONDWELL B236 0x0000 Game Card Joystick
product CONTEC CNETPC 0x0000 Contec C-NET(PC)C
product IBM MICRODRIVE 0x0000 IBM Microdrive
product RAYTHEON WLAN 0x0000 WLAN Adapter
product SOCKET EA_ETHER 0x0000 Socket Communications EA
product TDK LAK_CD011WL 0x0000 TDK LAK-CD011WL
so use only the vendor field for the end sentinel.
| -rw-r--r-- | sys/dev/pccard/pccard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 1d4993f..471840e 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -339,7 +339,7 @@ pccard_do_product_lookup(device_t bus, device_t dev, return (NULL); if (pccard_get_product_str(dev, &prodstr)) return (NULL); - for (ent = tab; ent->pp_vendor != 0 && ent->pp_product != 0; ent = + for (ent = tab; ent->pp_vendor != 0; ent = (const struct pccard_product *) ((const char *) ent + ent_size)) { matches = 1; if (ent->pp_vendor == PCCARD_VENDOR_ANY && |
