From 35fb90deb7a8ce831329c9b9b98f1b7dd2d5dd54 Mon Sep 17 00:00:00 2001
From: Hasso Tepper <hasso@dragonflybsd.org>
Date: Sat, 9 Aug 2008 09:15:05 +0000
Subject: [PATCH] MFC rev 1.2:   Detach correctly so there is no need to panic
 during reattach.

---
 sys/dev/misc/cmx/cmx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/misc/cmx/cmx.c b/sys/dev/misc/cmx/cmx.c
index 373870f75f..0010386fd7 100644
--- a/sys/dev/misc/cmx/cmx.c
+++ b/sys/dev/misc/cmx/cmx.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/cmx/cmx.c,v 1.1 2008/03/06 08:09:45 rink Exp $
- * $DragonFly: src/sys/dev/misc/cmx/cmx.c,v 1.1 2008/04/23 08:57:10 hasso Exp $
+ * $DragonFly: src/sys/dev/misc/cmx/cmx.c,v 1.1.2.1 2008/08/09 09:15:05 hasso Exp $
  */
 
 /*
@@ -284,10 +284,10 @@ cmx_detach(device_t dev)
 	}
 
 	wakeup(sc);
-	destroy_dev(sc->cdev);
-
 	DEBUG_printf(dev, "releasing resources\n");
 	cmx_release_resources(dev);
+	dev_ops_remove(&cmx_ops, -1, device_get_unit(dev));
+
 	return 0;
 }
 
-- 
2.11.4.GIT