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

[sfrench/cifs-2.6.git] / arch / arm / mm / dma-mapping.c

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 16c2cdd04639284376b782ac927801fa168213e0..089c9c644cce2add8859103eb1e8c8812561daaa 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;