From 26a69b0801a55d082ba088d57ba2781b196d7a64 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 16 Aug 2004 11:01:13 +0000 Subject: (probe_that_type) do not prompt in discovered_device() before loading usb controllers (they're not network devices) --- mdk-stage1/probing.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mdk-stage1') 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) -- cgit v1.2.1