1 files changed, 17 insertions, 2 deletions

diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 7fcc6d4c2e0b..f870d4cbbc5c 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -337,6 +337,7 @@ static int
 amr_pci_shutdown(device_t dev)
 {
     struct amr_softc	*sc = device_get_softc(dev);
+    int			i,error,s;
 
     debug_called(1);
 
@@ -348,9 +349,23 @@ amr_pci_shutdown(device_t dev)
     device_printf(sc->amr_dev, "flushing cache...");
     printf("%s\n", amr_flush(sc) ? "failed" : "done");
 
+    s = splbio();
+    error = 0;
+
+    /* delete all our child devices */
+    for(i = 0 ; i < AMR_MAXLD; i++) {
+	if( sc->amr_drive[i].al_disk != 0) {
+	    if((error = device_delete_child(sc->amr_dev,sc->amr_drive[i].al_disk)) != 0)
+		goto shutdown_out;
+	    sc->amr_drive[i].al_disk = 0;
+	}
+    }
+
     /* XXX disable interrupts? */
-    
-    return(0);
+
+shutdown_out:
+    splx(s);
+    return(error);
 }
 
 /********************************************************************************