ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

dmapool: rearrange page alloc failure handling

Browse Source 
Handle the error in a condition so the good path can be in the normal
flow.

Link: https://lkml.kernel.org/r/20230126215125.4069751-8-kbusch@meta.com
Fixes: 2d55c16c0c ("dmapool: create/destroy cleanup")
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Keith Busch
2023-01-26 13:51:20 -08:00
committed by Andrew Morton
parent d93e08b755
commit 5407df10e5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mm/dmapool.c
View File

@@ -292,17 +292,19 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
page = kmalloc(sizeof(*page), mem_flags); page = kmalloc(sizeof(*page), mem_flags);
if (!page) if (!page)
return NULL; return NULL;
page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation, page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation,
&page->dma, mem_flags); &page->dma, mem_flags);
if (page->vaddr) { if (!page->vaddr) {
pool_init_page(pool, page);
pool_initialise_page(pool, page);
page->in_use = 0;
page->offset = 0;
} else {
kfree(page); kfree(page);
page = NULL; return NULL;
} }
pool_init_page(pool, page);
pool_initialise_page(pool, page);
page->in_use = 0;
page->offset = 0;
return page; return page;
} }