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

Commit fe0355ce authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dma-coherent: limit alignment of dma-coherent allocations"

parents 7ca9402a 88ae006e

drivers/base/dma-coherent.c

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ static void *__dma_alloc_from_coherent(struct dma_coherent_mem *mem, 
	int pageno;

	void *ret;



	if (order > CONFIG_CMA_ALIGNMENT)

		order = CONFIG_CMA_ALIGNMENT;



	spin_lock_irqsave(&mem->spinlock, flags);



	if (unlikely(size > (mem->size << PAGE_SHIFT)))