iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: nand: sh_flctl: handle dma_submit() errors

Browse Source 
Some build tools noticed that 'cookie' is being set but not used. Might
as well catch the errors here and handle them the same way we handle
other DMA prep steps.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Brian Norris 2016-05-05 12:42:44 -07:00 committed by Boris Brezillon
parent d9ca77f0ea
commit 3fe4f900bf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/nand/sh_flctl.c
View File

@ -397,7 +397,7 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
struct dma_chan *chan; struct dma_chan *chan;
enum dma_transfer_direction tr_dir; enum dma_transfer_direction tr_dir;
dma_addr_t dma_addr; dma_addr_t dma_addr;
dma_cookie_t cookie = -EINVAL; dma_cookie_t cookie;
uint32_t reg; uint32_t reg;
int ret; int ret;
@ -423,6 +423,12 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
desc->callback = flctl_dma_complete; desc->callback = flctl_dma_complete;
desc->callback_param = flctl; desc->callback_param = flctl;
cookie = dmaengine_submit(desc); cookie = dmaengine_submit(desc);
if (dma_submit_error(cookie)) {
ret = dma_submit_error(cookie);
dev_warn(&flctl->pdev->dev,
"DMA submit failed, falling back to PIO\n");
goto out;
}
dma_async_issue_pending(chan); dma_async_issue_pending(chan);
} else { } else {