diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-08-16 11:01:13 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-08-16 11:01:13 +0000 |
| commit | 26a69b0801a55d082ba088d57ba2781b196d7a64 (patch) | |
| tree | 13bfe1bfc644eca48fe61f9b015b2b5f3aefddbc | |
| parent | 3abbaeac83e483d21d0b94696ff91737e0f97aa8 (diff) | |
| download | drakx-26a69b0801a55d082ba088d57ba2781b196d7a64.tar drakx-26a69b0801a55d082ba088d57ba2781b196d7a64.tar.gz drakx-26a69b0801a55d082ba088d57ba2781b196d7a64.tar.bz2 drakx-26a69b0801a55d082ba088d57ba2781b196d7a64.tar.xz drakx-26a69b0801a55d082ba088d57ba2781b196d7a64.zip | |
(probe_that_type) do not prompt in discovered_device() before loading usb controllers (they're not network devices)
| -rw-r--r-- | mdk-stage1/probing.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 4e629bbff..37e55b542 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -225,6 +225,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u unsigned int i; unsigned short vendor, device, subvendor, subdevice, class_, class_prog, devbusfn; const char *name, *module; + enum driver_type type_ = type; if (!fgets(buf, sizeof(buf), f)) break; @@ -265,6 +266,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u class_prog == 0x20 ? "ehci-hcd" : NULL; if (module) { name = "USB Controller"; + type_ = USB_CONTROLLERS; goto found_pci_device; } } @@ -296,7 +298,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u continue; found_pci_device: - discovered_device(type, vendor, device, subvendor, subdevice, name, module); + discovered_device(type_, vendor, device, subvendor, subdevice, name, module); } end_pci_probe:; if (f) |