lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 024/235] amd-xgbe: use dma_mapping_error to check map errors
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit b24dbfe9ce03d9f83306616f22fb0e04e8960abe ]

    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: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    --- 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_
    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;

    \
     
     \ /
      Last update: 2018-09-24 14:52    [W:4.432 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site