diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0111-amd-xgbe-use-dma_mapping_error-to-check-map-errors.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0111-amd-xgbe-use-dma_mapping_error-to-check-map-errors.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0111-amd-xgbe-use-dma_mapping_error-to-check-map-errors.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0111-amd-xgbe-use-dma_mapping_error-to-check-map-errors.patch deleted file mode 100644 index 1a902632..00000000 --- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0111-amd-xgbe-use-dma_mapping_error-to-check-map-errors.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a3c0851e777f229877dcd8480b254b2750a601c4 Mon Sep 17 00:00:00 2001 -From: YueHaibing <yuehaibing@huawei.com> -Date: Thu, 26 Jul 2018 09:51:27 +0800 -Subject: [PATCH 111/131] 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> -Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> ---- - drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 7 +++---- - 1 file 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 cc1e4f8..5330942 100755 ---- 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 @@ static int xgbe_alloc_pages(struct xgbe_prv_data *pdata, - /* 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; --- -2.7.4 - |