summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-16 20:36:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-16 20:36:45 +0000
commit4ee281db510d8fe469b21925280ca6495f48c410 (patch)
tree9d20b7bde6ff34ec912ba7024569f7ee0ffb66ed
parent34f1e89562fa9d4b84318c1b89b843c672ca3c0d (diff)
downloadldetect-4ee281db510d8fe469b21925280ca6495f48c410.tar
ldetect-4ee281db510d8fe469b21925280ca6495f48c410.tar.gz
ldetect-4ee281db510d8fe469b21925280ca6495f48c410.tar.bz2
ldetect-4ee281db510d8fe469b21925280ca6495f48c410.tar.xz
ldetect-4ee281db510d8fe469b21925280ca6495f48c410.zip
teach titi that !(a && !b) is not (!a && !b) but (!a || b)
(the other solution is to teach him to *test*) (oh, remind me to teach him not to re-indent the whole code until he doesn't make stupid bugs)
-rw-r--r--ldetect.spec8
-rw-r--r--pciusb.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/ldetect.spec b/ldetect.spec
index 5878b17..32c5ca6 100644
--- a/ldetect.spec
+++ b/ldetect.spec
@@ -1,7 +1,7 @@
# !! DON'T MODIFY HERE, MODIFY IN THE CVS !!
%define name ldetect
%define version 0.4.2
-%define release 1mdk
+%define release 2mdk
Name: %{name}
Version: %{version}
@@ -53,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*
%changelog
+* Tue Jul 16 2002 Pixel <pixel@mandrakesoft.com> 0.4.2-2mdk
+- pciusb.c: teach titi that !(a && !b) is not (!a && !b) but (!a || b)
+ (the other solution is to teach him to *test*)
+ (oh, remind me to teach him not to re-indent the whole code until he
+ doesn't make stupid bugs)
+
* Tue Jul 16 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 0.4.2-1mdk
- pci.c:
o move exception stuff from the fast path into the probe all patch
diff --git a/pciusb.c b/pciusb.c
index eb5fa1f..7d3ef95 100644
--- a/pciusb.c
+++ b/pciusb.c
@@ -111,7 +111,7 @@ extern int pciusb_find_modules(struct pciusb_entries *entries, const char *fpciu
return 0; /* leave, let the caller call again with subids */
}
- if ((nb == 4 && !(subvendor == e->subvendor && subdevice == e->subdevice)) && !e->module)
+ if ((nb == 4 && !(subvendor == e->subvendor && subdevice == e->subdevice)) || e->module)
continue; // subids differ
if (!p) { // only calc text & module if not already done
p = buf + offset + 1;