- Fix the busname in the DRIVER_MODULE.

- Skip PnP devices as some wedge when trying to probe them as C-NET(98)S.

This fix makes le(4) actually work with the C-NET(98)S.

Reviewed by:	marius
Tested by:	Watanabe Kazuhiro < CQG00620 at nifty dot ne dot jp >

1 files changed, 8 insertions, 1 deletions

diff --git a/sys/dev/le/if_le_cbus.c b/sys/dev/le/if_le_cbus.c
index 8a6fd50f832e..c8a881815552 100644
--- a/sys/dev/le/if_le_cbus.c
+++ b/sys/dev/le/if_le_cbus.c
@@ -104,7 +104,7 @@ static device_method_t le_cbus_methods[] = {
 };
 
 DEFINE_CLASS_0(le, le_cbus_driver, le_cbus_methods, sizeof(struct le_cbus_softc));
-DRIVER_MODULE(le, cbus, le_cbus_driver, le_devclass, 0, 0);
+DRIVER_MODULE(le, isa, le_cbus_driver, le_devclass, 0, 0);
 MODULE_DEPEND(le, ether, 1, 1, 1);
 
 static bus_addr_t le_ioaddr_cnet98s[CNET98S_IOSIZE] = {
@@ -217,6 +217,13 @@ le_cbus_probe(device_t dev)
 	struct lance_softc *sc;
 	int error;
 
+	/*
+	 * Skip PnP devices as some wedge when trying to probe them as
+	 * C-NET(98)S.
+	 */
+	if (isa_get_vendorid(dev))
+		return (ENXIO);
+
 	lesc = device_get_softc(dev);
 	sc = &lesc->sc_am7990.lsc;