When device ID lookup fails, return hexadecimal device ID instead of vendor ID.

Well spotted by Axel Bodemann <Axel.Bodemann@ruhr-uni-bochum.de>, I've just
extended the fix to subsystem ID's.

diff --git a/ChangeLog b/ChangeLog
index cb5a3b77447484ca4a3ab856fa9a45205f360c2e..308ee8d0dd5db20c9020c8cc8285d24c3c884d89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 21 22:11:10 1999  Martin Mares  <mj@albireo.ucw.cz>
+
+       * lib/names.c (pci_lookup_name): When device ID lookup
+       fails, return hexadecimal device ID instead of vendor ID.
+       Well spotted by Axel Bodemann <Axel.Bodemann@ruhr-uni-bochum.de>,
+       I've just extended the fix to subsystem ID's.
+
 Thu Jun 17 19:48:21 1999  Martin Mares  <mj@albireo.ucw.cz>
 
        * lspci.c (show_agp): Bug fix from Petr Vandrovec

diff --git a/lib/names.c b/lib/names.c
index e18e47f4db23f64496ae562860c4d705b5aa78d4..a052f4bb07250581a1aded789079eaefdc22f51b 100644 (file)
--- a/lib/names.c
+++ b/lib/names.c
@@ -1,5 +1,5 @@
 /*
- *     $Id: names.c,v 1.1 1999/01/22 21:05:33 mj Exp $
+ *     $Id: names.c,v 1.2 1999/06/21 20:17:19 mj Exp $
  *
  *     The PCI Library -- ID to Name Translation
  *
@@ -254,7 +254,7 @@ pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, u32 arg1,
       if (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2))
        return n->name;
       else
-       res = snprintf(buf, size, "%04x", arg1);
+       res = snprintf(buf, size, "%04x", arg2);
       break;
     case PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE:
       res = compound_name(a, num, buf, size, NL_VENDOR, arg1, arg2);
@@ -269,7 +269,7 @@ pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, u32 arg1,
       if (n = nl_lookup(a, num, NL_SUBSYSTEM_DEVICE, arg1, arg2))
        return n->name;
       else
-       res = snprintf(buf, size, "%04x", arg1);
+       res = snprintf(buf, size, "%04x", arg2);
       break;
     case PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE | PCI_LOOKUP_SUBSYSTEM:
       res = compound_name(a, num, buf, size, NL_SUBSYSTEM_VENDOR, arg1, arg2);