Merge "msm: vidc: Fixing double freeing of dma buf" (63729630) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/vidc/msm_smem.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ static int msm_dma_get_device_address(struct dma_buf *dbuf, unsigned long align,
		dma_buf_detach(dbuf, attach);
		mem_buf_size_mismatch:
		mem_buf_attach_failed:
		dma_buf_put(dbuf);
		mem_map_failed:
		return rc;
		}
		@@ -149,7 +148,6 @@ static int msm_dma_put_device_address(u32 flags,
		dma_buf_unmap_attachment(mapping_info->attach,
		mapping_info->table, DMA_BIDIRECTIONAL);
		dma_buf_detach(mapping_info->buf, mapping_info->attach);
		dma_buf_put(mapping_info->buf);
		trace_msm_smem_buffer_iommu_op_end("UNMAP", 0, 0, 0, 0, 0);

		mapping_info->dev = NULL;