summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorskra <skra@FreeBSD.org>2015-11-10 10:56:52 +0000
committerskra <skra@FreeBSD.org>2015-11-10 10:56:52 +0000
commitdb6f1700ecb461ec1b4303cec14f12d6fd2d2dda (patch)
treea642455e6d9ccf0853e07c75d659ac3891b83cb9 /sys/contrib
parent4ef66cf839047e9906f3b84752b98ce05851d261 (diff)
downloadFreeBSD-src-db6f1700ecb461ec1b4303cec14f12d6fd2d2dda.zip
FreeBSD-src-db6f1700ecb461ec1b4303cec14f12d6fd2d2dda.tar.gz
Fix slots DMA memory handling. It's similar to r290553.
Discussed with: gonzo Approved by: kib (mentor)
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
index 6e5f320..753e8e5 100644
--- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
@@ -213,10 +213,10 @@ vchiq_platform_init(VCHIQ_STATE_T *state)
failed_vchiq_init:
failed_init_slots:
-failed_load:
bus_dmamap_unload(bcm_slots_dma_tag, bcm_slots_dma_map);
+failed_load:
+ bus_dmamem_free(bcm_slots_dma_tag, g_slot_mem, bcm_slots_dma_map);
failed_alloc:
- bus_dmamap_destroy(bcm_slots_dma_tag, bcm_slots_dma_map);
bus_dma_tag_destroy(bcm_slots_dma_tag);
return err;
@@ -227,7 +227,7 @@ vchiq_platform_exit(VCHIQ_STATE_T *state)
{
bus_dmamap_unload(bcm_slots_dma_tag, bcm_slots_dma_map);
- bus_dmamap_destroy(bcm_slots_dma_tag, bcm_slots_dma_map);
+ bus_dmamem_free(bcm_slots_dma_tag, g_slot_mem, bcm_slots_dma_map);
bus_dma_tag_destroy(bcm_slots_dma_tag);
}
OpenPOWER on IntegriCloud