From owner-svn-src-all@freebsd.org  Tue Nov 10 10:56:53 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7128AA2BF58;
 Tue, 10 Nov 2015 10:56:53 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 38FA61182;
 Tue, 10 Nov 2015 10:56:53 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAAAuqxK099249;
 Tue, 10 Nov 2015 10:56:52 GMT (envelope-from skra@FreeBSD.org)
Received: (from skra@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAAAuqCJ099248;
 Tue, 10 Nov 2015 10:56:52 GMT (envelope-from skra@FreeBSD.org)
Message-Id: <201511101056.tAAAuqCJ099248@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: skra set sender to
 skra@FreeBSD.org using -f
From: Svatopluk Kraus <skra@FreeBSD.org>
Date: Tue, 10 Nov 2015 10:56:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290642 - head/sys/contrib/vchiq/interface/vchiq_arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2015 10:56:53 -0000

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);
 }