Fixed a silly bug in processing of the -D switch.

diff --git a/ChangeLog b/ChangeLog
index 27c57a47383d32b2bd17554017f639516bf28650..98ee5621ac849d5178300bb7311fef6eb6afbf31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-05  Martin Mares  <mj@ucw.cz>
+
+       * Released as 2.2.3.
+
+       * lspci.c (scan_device): The -D switch didn't work as intended
+       in -m mode.
+
 2006-05-05  Martin Mares  <mj@ucw.cz>
 
        * Released as 2.2.2.

diff --git a/Makefile b/Makefile
index 4b69e877d4e43e658c8225e28924b9270a69467f..5f173f36e051e37c44f33c49f20f310d3d7d335b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 OPT=-O2
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
 
-VERSION=2.2.2
+VERSION=2.2.3
 DATE=2006-05-05
 
 PREFIX=/usr/local

diff --git a/lspci.c b/lspci.c
index 8be707c1bd3429ab8128c5d821e81f61318a0313..581ee65aab342772a8d0577514aba49097495478 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -106,7 +106,7 @@ scan_device(struct pci_dev *p)
 {
   struct device *d;
 
-  if (p->domain)
+  if (p->domain && !show_domains)
     show_domains = 1;
   if (!pci_filter_match(&filter, p))
     return NULL;