1 files changed, 15 insertions, 20 deletions

diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c
index 3055d7732e97..23ee1004bec7 100644
--- a/sys/dev/age/if_age.c
+++ b/sys/dev/age/if_age.c
@@ -1229,76 +1229,71 @@ age_dma_free(struct age_softc *sc)
 	}
 	/* Tx ring. */
 	if (sc->age_cdata.age_tx_ring_tag != NULL) {
-		if (sc->age_cdata.age_tx_ring_map != NULL)
+		if (sc->age_rdata.age_tx_ring_paddr != 0)
 			bus_dmamap_unload(sc->age_cdata.age_tx_ring_tag,
 			    sc->age_cdata.age_tx_ring_map);
-		if (sc->age_cdata.age_tx_ring_map != NULL &&
-		    sc->age_rdata.age_tx_ring != NULL)
+		if (sc->age_rdata.age_tx_ring != NULL)
 			bus_dmamem_free(sc->age_cdata.age_tx_ring_tag,
 			    sc->age_rdata.age_tx_ring,
 			    sc->age_cdata.age_tx_ring_map);
+		sc->age_rdata.age_tx_ring_paddr = 0;
 		sc->age_rdata.age_tx_ring = NULL;
-		sc->age_cdata.age_tx_ring_map = NULL;
 		bus_dma_tag_destroy(sc->age_cdata.age_tx_ring_tag);
 		sc->age_cdata.age_tx_ring_tag = NULL;
 	}
 	/* Rx ring. */
 	if (sc->age_cdata.age_rx_ring_tag != NULL) {
-		if (sc->age_cdata.age_rx_ring_map != NULL)
+		if (sc->age_rdata.age_rx_ring_paddr != 0)
 			bus_dmamap_unload(sc->age_cdata.age_rx_ring_tag,
 			    sc->age_cdata.age_rx_ring_map);
-		if (sc->age_cdata.age_rx_ring_map != NULL &&
-		    sc->age_rdata.age_rx_ring != NULL)
+		if (sc->age_rdata.age_rx_ring != NULL)
 			bus_dmamem_free(sc->age_cdata.age_rx_ring_tag,
 			    sc->age_rdata.age_rx_ring,
 			    sc->age_cdata.age_rx_ring_map);
+		sc->age_rdata.age_rx_ring_paddr = 0;
 		sc->age_rdata.age_rx_ring = NULL;
-		sc->age_cdata.age_rx_ring_map = NULL;
 		bus_dma_tag_destroy(sc->age_cdata.age_rx_ring_tag);
 		sc->age_cdata.age_rx_ring_tag = NULL;
 	}
 	/* Rx return ring. */
 	if (sc->age_cdata.age_rr_ring_tag != NULL) {
-		if (sc->age_cdata.age_rr_ring_map != NULL)
+		if (sc->age_rdata.age_rr_ring_paddr != 0)
 			bus_dmamap_unload(sc->age_cdata.age_rr_ring_tag,
 			    sc->age_cdata.age_rr_ring_map);
-		if (sc->age_cdata.age_rr_ring_map != NULL &&
-		    sc->age_rdata.age_rr_ring != NULL)
+		if (sc->age_rdata.age_rr_ring != NULL)
 			bus_dmamem_free(sc->age_cdata.age_rr_ring_tag,
 			    sc->age_rdata.age_rr_ring,
 			    sc->age_cdata.age_rr_ring_map);
+		sc->age_rdata.age_rr_ring_paddr = 0;
 		sc->age_rdata.age_rr_ring = NULL;
-		sc->age_cdata.age_rr_ring_map = NULL;
 		bus_dma_tag_destroy(sc->age_cdata.age_rr_ring_tag);
 		sc->age_cdata.age_rr_ring_tag = NULL;
 	}
 	/* CMB block */
 	if (sc->age_cdata.age_cmb_block_tag != NULL) {
-		if (sc->age_cdata.age_cmb_block_map != NULL)
+		if (sc->age_rdata.age_cmb_block_paddr != 0)
 			bus_dmamap_unload(sc->age_cdata.age_cmb_block_tag,
 			    sc->age_cdata.age_cmb_block_map);
-		if (sc->age_cdata.age_cmb_block_map != NULL &&
-		    sc->age_rdata.age_cmb_block != NULL)
+		if (sc->age_rdata.age_cmb_block != NULL)
 			bus_dmamem_free(sc->age_cdata.age_cmb_block_tag,
 			    sc->age_rdata.age_cmb_block,
 			    sc->age_cdata.age_cmb_block_map);
+		sc->age_rdata.age_cmb_block_paddr = 0;
 		sc->age_rdata.age_cmb_block = NULL;
-		sc->age_cdata.age_cmb_block_map = NULL;
 		bus_dma_tag_destroy(sc->age_cdata.age_cmb_block_tag);
 		sc->age_cdata.age_cmb_block_tag = NULL;
 	}
 	/* SMB block */
 	if (sc->age_cdata.age_smb_block_tag != NULL) {
-		if (sc->age_cdata.age_smb_block_map != NULL)
+		if (sc->age_rdata.age_smb_block_paddr != 0)
 			bus_dmamap_unload(sc->age_cdata.age_smb_block_tag,
 			    sc->age_cdata.age_smb_block_map);
-		if (sc->age_cdata.age_smb_block_map != NULL &&
-		    sc->age_rdata.age_smb_block != NULL)
+		if (sc->age_rdata.age_smb_block != NULL)
 			bus_dmamem_free(sc->age_cdata.age_smb_block_tag,
 			    sc->age_rdata.age_smb_block,
 			    sc->age_cdata.age_smb_block_map);
+		sc->age_rdata.age_smb_block_paddr = 0;
 		sc->age_rdata.age_smb_block = NULL;
-		sc->age_cdata.age_smb_block_map = NULL;
 		bus_dma_tag_destroy(sc->age_cdata.age_smb_block_tag);
 		sc->age_cdata.age_smb_block_tag = NULL;
 	}