diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-07-25 21:51:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-26 00:17:17 -0400 |
| commit | b24dbfe9ce03d9f83306616f22fb0e04e8960abe (patch) | |
| tree | 4d4f0d0c3fa0ce50cd9c6f21ab523051da770b83 /drivers/net/ethernet/amd | |
| parent | 756cd36626f773e9a72a39c1dd12da4deacfacdf (diff) | |
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>
Diffstat (limited to 'drivers/net/ethernet/amd')
| -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, | |||
| 289 | struct page *pages = NULL; | 289 | struct page *pages = NULL; |
| 290 | dma_addr_t pages_dma; | 290 | dma_addr_t pages_dma; |
| 291 | gfp_t gfp; | 291 | gfp_t gfp; |
| 292 | int order, ret; | 292 | int order; |
| 293 | 293 | ||
| 294 | again: | 294 | again: |
| 295 | order = alloc_order; | 295 | order = alloc_order; |
| @@ -316,10 +316,9 @@ again: | |||
| 316 | /* Map the pages */ | 316 | /* Map the pages */ |
| 317 | pages_dma = dma_map_page(pdata->dev, pages, 0, | 317 | pages_dma = dma_map_page(pdata->dev, pages, 0, |
| 318 | PAGE_SIZE << order, DMA_FROM_DEVICE); | 318 | PAGE_SIZE << order, DMA_FROM_DEVICE); |
| 319 | ret = dma_mapping_error(pdata->dev, pages_dma); | 319 | if (dma_mapping_error(pdata->dev, pages_dma)) { |
| 320 | if (ret) { | ||
| 321 | put_page(pages); | 320 | put_page(pages); |
| 322 | return ret; | 321 | return -ENOMEM; |
| 323 | } | 322 | } |
| 324 | 323 | ||
| 325 | pa->pages = pages; | 324 | pa->pages = pages; |
