svn commit: r345792 - stable/12/sys/kern

[Marcin Wojtas]

Author: mw
Date: Tue Apr  2 08:35:24 2019
New Revision: 345792
URL: https://svnweb.freebsd.org/changeset/base/345792

Log:
  MFC r344676: Prevent detaching driver if the attach is not finished
  
  Submitted by: Rafal Kozik <rk at semihalf.com>
  Obtained from: Semihalf
  Sponsored by: Amazon, Inc.

Modified:
  stable/12/sys/kern/subr_bus.c

Modified: stable/12/sys/kern/subr_bus.c
==============================================================================
--- stable/12/sys/kern/subr_bus.c	Tue Apr  2 04:12:06 2019	(r345791)
+++ stable/12/sys/kern/subr_bus.c	Tue Apr  2 08:35:24 2019	(r345792)
@@ -2994,6 +2994,10 @@ device_detach(device_t dev)
 	PDEBUG(("%s", DEVICENAME(dev)));
 	if (dev->state == DS_BUSY)
 		return (EBUSY);
+	if (dev->state == DS_ATTACHING) {
+		device_printf(dev, "device in attaching state! Deferring detach.\n");
+		return (EBUSY);
+	}
 	if (dev->state != DS_ATTACHED)
 		return (0);