mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
staging: gasket: page table: remove dead code in coherent mem alloc
gasket_alloc_coherent_memory() has some unnecessary code related to out of memory checking that will never hit the condition checked, remove. Signed-off-by: Todd Poynor <toddpoynor@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b1004491c9
commit
02d3718633
1 changed files with 1 additions and 5 deletions
|
@ -1316,7 +1316,6 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
|
|||
GFP_KERNEL);
|
||||
if (!gasket_dev->page_table[index]->coherent_pages)
|
||||
goto nomem;
|
||||
*dma_address = 0;
|
||||
|
||||
gasket_dev->coherent_buffer.length_bytes =
|
||||
PAGE_SIZE * (num_pages);
|
||||
|
@ -1331,15 +1330,12 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
|
|||
(u64)mem + j * PAGE_SIZE;
|
||||
}
|
||||
|
||||
if (*dma_address == 0)
|
||||
goto nomem;
|
||||
return 0;
|
||||
|
||||
nomem:
|
||||
if (mem) {
|
||||
if (mem)
|
||||
dma_free_coherent(gasket_get_device(gasket_dev),
|
||||
num_pages * PAGE_SIZE, mem, handle);
|
||||
}
|
||||
|
||||
kfree(gasket_dev->page_table[index]->coherent_pages);
|
||||
gasket_dev->page_table[index]->coherent_pages = NULL;
|
||||
|
|
Loading…
Reference in a new issue