From: Martin Mares <mj@ucw.cz>
Date: Sat, 26 Nov 2005 11:53:38 +0000 (+0000)
Subject: Fixed a bug in name lookups
X-Git-Tag: v3.0.0~77
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a99c0d6963f8477f9cc7c65ab26c0ed229bf792c;p=pciutils.git

Fixed a bug in name lookups

git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-88
---

diff --git a/ChangeLog b/ChangeLog
index d55bf27..c2ae064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-26  Martin Mares  <mj@ucw.cz>
+
+	* lspci.c (show_machine): Subsystem vendors were printed incorrectly
+	in machine-readable modes. Thanks to Pavel Celeda for a bug report.
+
 2005-10-11  Martin Mares  <mj@ucw.cz>
 
 	* lspci.c (new_bus): Fixed a memory leak. Thanks to Paul Sangree for reporting it.
diff --git a/lspci.c b/lspci.c
index 20408a9..5a9251e 100644
--- a/lspci.c
+++ b/lspci.c
@@ -1791,7 +1791,7 @@ show_machine(struct device *d)
       if (sv_id && sv_id != 0xffff)
 	{
 	  printf("SVendor:\t%s\n",
-		 pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id, sv_id, sd_id));
+		 pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id));
 	  printf("SDevice:\t%s\n",
 		 pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id, sv_id, sd_id));
 	}
@@ -1816,7 +1816,7 @@ show_machine(struct device *d)
 	printf(" -p%02x", c);
       if (sv_id && sv_id != 0xffff)
 	printf(" \"%s\" \"%s\"",
-	       pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id, sv_id, sd_id),
+	       pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id),
 	       pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id, sv_id, sd_id));
       else
 	printf(" \"\" \"\"");