Merge "cma: Remove potential deadlock situation" (1ac99078) · Commits · e / devices / android_kernel_sony_msm8994

drivers/base/dma-contiguous.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -591,10 +591,10 @@ bool dma_release_from_contiguous(struct device *dev, unsigned long pfn,

		VM_BUG_ON(pfn + count > cma->base_pfn + cma->count);

		mutex_lock(&cma_mutex);
		bitmap_clear(cma->bitmap, pfn - cma->base_pfn, count);
		if (cma->in_system)
		free_contig_range(pfn, count);
		mutex_lock(&cma_mutex);
		bitmap_clear(cma->bitmap, pfn - cma->base_pfn, count);
		mutex_unlock(&cma_mutex);

		return true;