diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-07-26 03:51:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-26 06:17:17 +0200 |
| commit | b24dbfe9ce03d9f83306616f22fb0e04e8960abe (patch) | |
| tree | 4d4f0d0c3fa0ce50cd9c6f21ab523051da770b83 | |
| parent | Merge branch 'mlxsw-Introduce-algorithmic-TCAM-support' (diff) | |
| download | linux-b24dbfe9ce03d9f83306616f22fb0e04e8960abe.tar.xz linux-b24dbfe9ce03d9f83306616f22fb0e04e8960abe.zip | |
amd-xgbe: use dma_mapping_error to check map errors
The dma_mapping_error() returns true or false, but we want
to return -ENOMEM if there was an error.
Fixes: 174fd2597b0b ("amd-xgbe: Implement split header receive support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c index cc1e4f820e64..533094233659 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c @@ -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; |