summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-09-05 11:25:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-09-05 11:25:17 +0000
commit56b361562e3dc0e87b7db5e1362784041c5ce141 (patch)
tree85c00356a0c3a73725fd32936190722d22454b10
parent691a94a42d42c3ab843df844d4c6eb605ad3bd9f (diff)
downloadldetect-56b361562e3dc0e87b7db5e1362784041c5ce141.tar
ldetect-56b361562e3dc0e87b7db5e1362784041c5ce141.tar.gz
ldetect-56b361562e3dc0e87b7db5e1362784041c5ce141.tar.bz2
ldetect-56b361562e3dc0e87b7db5e1362784041c5ce141.tar.xz
ldetect-56b361562e3dc0e87b7db5e1362784041c5ce141.zip
fix ugly case for snd-usb-audio which should have made titi think that
something was broken. Really fixing the right way (this fixes automatic detection of unknown usb controllers)
-rw-r--r--ldetect.spec7
-rw-r--r--pciusb.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/ldetect.spec b/ldetect.spec
index 2b4aac7..17d1407 100644
--- a/ldetect.spec
+++ b/ldetect.spec
@@ -1,6 +1,6 @@
Name: ldetect
Version: 0.4.6
-Release: 5mdk
+Release: 6mdk
Summary: Light hardware detection library
Source: %name.tar.bz2
Group: System/Libraries
@@ -49,6 +49,11 @@ rm -rf $RPM_BUILD_ROOT
%_libdir/*
%changelog
+* Thu Sep 5 2002 Pixel <pixel@mandrakesoft.com> 0.4.6-6mdk
+- fix ugly case for snd-usb-audio which should have made titi think that
+something was broken. Really fixing the right way (this fixes automatic
+detection of unknown usb controllers)
+
* Thu Aug 29 2002 Pixel <pixel@mandrakesoft.com> 0.4.6-5mdk
- fix getting the Product name in usb (occurs when there is no entry in usbtable)
diff --git a/pciusb.c b/pciusb.c
index 31953b8..eda4ca6 100644
--- a/pciusb.c
+++ b/pciusb.c
@@ -122,8 +122,8 @@ extern int pciusb_find_modules(struct pciusb_entries *entries, const char *fpciu
p = buf + offset + 1;
q = strchr(p, '\t');
}
- if (!e->module || (e->module && strcmp(e->module, "snd-usb-audio")))
- e->module = strcmp(p, "unknown") ? strndup(p,q-p-1) : NULL;
+ if (strncmp(p, "unknown", q-p-1))
+ e->module = strndup(p,q-p-1);
ifree(e->text); /* usb.c set it so that we display something when usbtable doesn't refer that hw*/
e->text = strndup(q+2, strlen(q)-4);