Author: skra
Date: Tue Nov 10 10:56:52 2015
New Revision: 290642
URL: https://svnweb.freebsd.org/changeset/base/290642
Log:
Fix slots DMA memory handling. It's similar to r290553.
Discussed with: gonzo
Approved by: kib (mentor)
Modified:
head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
Modified: head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
==============================================================================
--- head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c Tue Nov 10
10:55:57 2015 (r290641)
+++ head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c Tue Nov 10
10:56:52 2015 (r290642)
@@ -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);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
