summaryrefslogtreecommitdiffstats
path: root/pciusb.c
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-07 13:47:34 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-07 13:47:34 +0000
commit155b5dac68c3a3e30ae12db5973a20e77e8c70ec (patch)
tree5dd34693b0b422719697af56feb5e51dd50dd7f3 /pciusb.c
parent82b8a69a8587485f16349e2cc418d0482031a563 (diff)
downloadldetect-155b5dac68c3a3e30ae12db5973a20e77e8c70ec.tar
ldetect-155b5dac68c3a3e30ae12db5973a20e77e8c70ec.tar.gz
ldetect-155b5dac68c3a3e30ae12db5973a20e77e8c70ec.tar.bz2
ldetect-155b5dac68c3a3e30ae12db5973a20e77e8c70ec.tar.xz
ldetect-155b5dac68c3a3e30ae12db5973a20e77e8c70ec.zip
rewrite
Diffstat (limited to 'pciusb.c')
-rw-r--r--pciusb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pciusb.c b/pciusb.c
index 3b03c8f..6b33cbf 100644
--- a/pciusb.c
+++ b/pciusb.c
@@ -72,21 +72,21 @@ static void find_modules_through_aliases(struct pciusb_entries *entries) {
read_toplevel_config(config, modalias, 0,
0, &modoptions, &commands, &aliases, &blacklist);
- char *aliascurrent = aliasdefault;
- unsigned int j;
- for (j = 0; j < 2 && !aliases; j++) {
+ char *alias_filelist[] = { aliasdefault, DKMS_ALIASES, NULL };
+ char **alias_file = alias_filelist;
+ while (*alias_file) {
/* We only use canned aliases as last resort. */
read_depends(dirname, modalias, &list);
if (list_empty(&list)
&& !find_command(modalias, commands))
{
- read_config(aliascurrent, modalias, 0,
+ read_config(*alias_file, modalias, 0,
0, &modoptions, &commands,
&aliases, &blacklist);
aliases = apply_blacklist(aliases, blacklist);
}
- aliascurrent = DKMS_ALIASES;
+ alias_file++;
}
if (aliases) {
// take the last one because we find eg: generic/ata_generic/sata_sil