From 2a06c0a46264d3a8a64885f6148aa715e0eb315f Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Tue, 26 Jan 2021 09:16:22 -0800 Subject: [PATCH] ANDROID: dma-buf: fix return type mismatch During backporting FROMLIST patch for 5.11-rc, there was return type mismatch warn. Fix it. Bug: 170340257 Bug: 120293424 Reported-by: kernel test robot Signed-off-by: Minchan Kim Change-Id: Ic489c56357184ac360c1e8feff5fbc7900f63ce6 --- drivers/dma-buf/heaps/chunk_heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/heaps/chunk_heap.c b/drivers/dma-buf/heaps/chunk_heap.c index a66a51bd032d..044c219bab62 100644 --- a/drivers/dma-buf/heaps/chunk_heap.c +++ b/drivers/dma-buf/heaps/chunk_heap.c @@ -319,7 +319,7 @@ struct dma_buf *chunk_heap_allocate(struct dma_heap *heap, unsigned long len, buffer = kzalloc(sizeof(*buffer), GFP_KERNEL); if (!buffer) - return ret; + return ERR_PTR(ret); INIT_LIST_HEAD(&buffer->attachments); mutex_init(&buffer->lock); @@ -383,7 +383,7 @@ struct dma_buf *chunk_heap_allocate(struct dma_heap *heap, unsigned long len, ret = dma_buf_fd(dmabuf, fd_flags); if (ret < 0) { dma_buf_put(dmabuf); - return ret; + return ERR_PTR(ret); } return dmabuf;