Better displaying of unknown subclasses.

diff --git a/ChangeLog b/ChangeLog
index 8bb7b852a8997241b96c697d06bc41bda930cc44..6247337b6beec1605db6ebb4644c4eaaccd4dba6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,17 @@
 2006-06-03  Martin Mares  <mj@ucw.cz>
 
-       * lib/names.c (pci_lookup_name): If PCI_LOOKUP_NO_NUMBERS is given,
-       pci_access->numeric_ids is ignored.
-
        * lspci.c: Introduced the -nn switch. Thanks to David N. Welton
        for the idea.
 
        * lib/names.c (pci_lookup_name): Introduced PCI_LOOKUP_MIXED and
        cleaned up the name selection code.
 
+       * lib/names.c (pci_lookup_name): If PCI_LOOKUP_NO_NUMBERS is given,
+       pci_access->numeric_ids is ignored.
+
+       * lib/names.c (pci_lookup_name): When class is identified and
+       subclass isn't, display class name and subclass number.
+
 2006-05-31  Martin Mares  <mj@ucw.cz>
 
        * setpci.c (main): Don't crash when an invalid width is specified.

diff --git a/lib/names.c b/lib/names.c
index 646a9c08019acae09233904c2205b02bef345f3c..e60de20c9ee7813aa1ce0656cbd2fd65fcf2923c 100644 (file)
--- a/lib/names.c
+++ b/lib/names.c
@@ -439,7 +439,7 @@ pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, ...)
       icls = va_arg(args, int);
       sprintf(numbuf, "%04x", icls);
       cls = id_lookup(a, ID_SUBCLASS, icls >> 8, icls & 0xff, 0, 0);
-      if (!cls && (cls = id_lookup(a, ID_CLASS, icls, 0, 0, 0)))
+      if (!cls && (cls = id_lookup(a, ID_CLASS, icls >> 8, 0, 0, 0)))
        {
          if (!(flags & PCI_LOOKUP_NUMERIC)) /* Include full class number */
            flags |= PCI_LOOKUP_MIXED;