Attachment #242409 for bug #271515

View | Details | Raw Unified | Return to bug 271515
Collapse All | Expand All




{
	int error;

	GIANT_REQUIRED;

	error = device_probe(dev);
	if (error == -1)

	else if (error != 0)
		return (error);

	CURVNET_SET_QUIET(vnet0);
	error = device_attach(dev);
	CURVNET_RESTORE();
	return error;
}


Return to bug 271515

Lines 2482-2488 device_probe_and_attach(device_t dev) Link Here

(-)b/sys/kern/subr_bus.c (-3 / +1 lines)
2482	{	2482	{
2483	int error;	2483	int error;
2484		2484
2485	bus_topo_assert();	2485	GIANT_REQUIRED;
2486		2486
2487	error = device_probe(dev);	2487	error = device_probe(dev);
2488	if (error == -1)	2488	if (error == -1)
Lines 2490-2498 device_probe_and_attach(device_t dev) Link Here
2490	else if (error != 0)	2490	else if (error != 0)
2491	return (error);	2491	return (error);
2492		2492
2493	CURVNET_SET_QUIET(vnet0);
2494	error = device_attach(dev);	2493	error = device_attach(dev);
2495	CURVNET_RESTORE();
2496	return error;	2494	return error;
2497	}	2495	}
2498		2496