Back out all the stuff that didn't belong in the last commit.

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index 0745624..95055dd 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -251,9 +251,11 @@ g_aes_orphan(struct g_consumer *cp)
 
 	gp = cp->geom;
 	sc = gp->softc;
-	g_wither_geom(gp, cp->provider->error);
+	gp->flags |= G_GEOM_WITHER;
+	error = cp->provider->error;
+	LIST_FOREACH(pp, &gp->provider, provider)
+		g_orphan_provider(pp, error);
 	bzero(sc, sizeof(struct g_aes_softc));	/* destroy evidence */
-	g_free(sc);
 	return;
 }
 
@@ -321,11 +323,9 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 		    strlen(aes_magic_test))) {
 			sc->keying = KEY_TEST;
 		} else {
-			g_free(buf);
 			g_free(sc);
 			break;
 		}
-		g_free(buf);
 		gp->softc = sc;
 		gp->access = g_aes_access;
 		sc->sectorsize = sectorsize;