Merge tag 'dma-mapping-5.20-2022-08-06' of git://git.infradead.org/users/hch/dma...

[platform/kernel/linux-starfive.git] / arch / arm / mm / dma-mapping.c

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 16c2cdd..089c9c6 100644 (file)
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -576,7 +576,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 
        *handle = DMA_MAPPING_ERROR;
        allowblock = gfpflags_allow_blocking(gfp);
-       cma = allowblock ? dev_get_cma_area(dev) : false;
+       cma = allowblock ? dev_get_cma_area(dev) : NULL;
 
        if (cma)
                buf->allocator = &cma_allocator;