redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

amd-xgbe: use dma_mapping_error to check map errors 

[ Upstream commit b24dbfe9ce ]

The dma_mapping_error() returns true or false, but we want
to return -ENOMEM if there was an error.

Fixes: 174fd2597b ("amd-xgbe: Implement split header receive support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
YueHaibing 2018-07-26 09:51:27 +08:00 committed by Greg Kroah-Hartman
parent 318f224d12
commit 36eb78a6ce
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
View File

@ -289,7 +289,7 @@ static int xgbe_alloc_pages(struct xgbe_prv_data *pdata,
struct page *pages = NULL;
dma_addr_t pages_dma;
gfp_t gfp;
int order, ret;
int order;
again:
order = alloc_order;
@ -316,10 +316,9 @@ again:
/* Map the pages */
pages_dma = dma_map_page(pdata->dev, pages, 0,
PAGE_SIZE << order, DMA_FROM_DEVICE);
ret = dma_mapping_error(pdata->dev, pages_dma);
if (ret) {
if (dma_mapping_error(pdata->dev, pages_dma)) {
put_page(pages);
return ret;
return -ENOMEM;
}
pa->pages = pages;