diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 228ee1d9a90f..0bda3217c839 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -186,6 +186,11 @@ ata_detach(device_t dev)
     bus_teardown_intr(dev, ch->r_irq, ch->ih);
     bus_release_resource(dev, SYS_RES_IRQ, ATA_IRQ_RID, ch->r_irq);
     ch->r_irq = NULL;
+
+    /* free DMA resources if DMA HW present*/
+    if (ch->dma.free)
+	ch->dma.free(dev);
+
     mtx_destroy(&ch->state_mtx);
     mtx_destroy(&ch->queue_mtx);
     return 0;
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index 68c209fe21cd..cbec410f76c5 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -544,14 +544,11 @@ ata_pcichannel_attach(device_t dev)
 static int
 ata_pcichannel_detach(device_t dev)
 {
-    struct ata_channel *ch = device_get_softc(dev);
     int error;
 
     if ((error = ata_detach(dev)))
 	return error;
 
-    ch->dma.free(dev);
-
     /* XXX SOS free resources for io and ctlio ?? */
 
     return 0;