Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31b569fd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: msm_iommu_sec: use dma_free_attrs to match dma_alloc_attrs"

parents d44691fd 60848728
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -351,7 +351,7 @@ static int msm_iommu_sec_ptbl_init(void)
	unsigned int spare;
	int ret, ptbl_ret = 0;
	int version;
	/* Use a dummy device for dma_alloc_coherent allocation */
	/* Use a dummy device for dma_alloc_attrs allocation */
	struct device dev = { 0 };
	void *cpu_addr;
	dma_addr_t paddr;
@@ -452,7 +452,7 @@ static int msm_iommu_sec_ptbl_init(void)
	return 0;

fail_mem:
	dma_free_coherent(&dev, psize[0], cpu_addr, paddr);
	dma_free_attrs(&dev, psize[0], cpu_addr, paddr, &attrs);
fail:
	return ret;
}