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

Commit 20c29a97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma mapping fix from Christoph Hellwig:
 "A fix for a fix that went in this merge window from Arnd"

* tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-coherent: fix rmem_dma_device_init regression
parents c52f56a6 6d573398

drivers/base/dma-coherent.c

+9 −10
Original line number Diff line number Diff line
@@ -348,17 +348,16 @@ static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev) 
	struct dma_coherent_mem *mem = rmem->priv;

	int ret;



	if (!mem)

		return -ENODEV;



	ret = dma_init_coherent_memory(rmem->base, rmem->base, rmem->size,

	if (!mem) {

		ret = dma_init_coherent_memory(rmem->base, rmem->base,

					       rmem->size,

					       DMA_MEMORY_EXCLUSIVE, &mem);



		if (ret) {

			pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",

				&rmem->base, (unsigned long)rmem->size / SZ_1M);

			return ret;

		}

	}

	mem->use_dev_dma_pfn_offset = true;

	rmem->priv = mem;

	dma_assign_coherent_memory(dev, mem);