D2294.diff
No OneTemporary
Actions

Size

946 B

Referenced Files

None

Subscribers

None

D2294.diff
View Options

	Index: head/sys/kern/subr_bus.c
	===================================================================
	--- head/sys/kern/subr_bus.c
	+++ head/sys/kern/subr_bus.c
	@@ -2113,6 +2113,16 @@
	}

	/*
	+ * Probes that return BUS_PROBE_NOWILDCARD or lower
	+ * only match on devices whose driver was explicitly
	+ * specified.
	+ */
	+ if (result <= BUS_PROBE_NOWILDCARD &&
	+ !(child->flags & DF_FIXEDCLASS)) {
	+ result = ENXIO;
	+ }
	+
	+ /*
	* The driver returned an error so it
	* certainly doesn't match.
	*/
	@@ -2127,14 +2137,6 @@
	* of pri for the first match.
	*/
	if (best == NULL \|\| result > pri) {
	- /*
	- * Probes that return BUS_PROBE_NOWILDCARD
	- * or lower only match on devices whose
	- * driver was explicitly specified.
	- */
	- if (result <= BUS_PROBE_NOWILDCARD &&
	- !(child->flags & DF_FIXEDCLASS))
	- continue;
	best = dl;
	pri = result;
	continue;