lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 158/314] fpga: dfl: afu: Corrected error handling levels
    Date
    From: Souptick Joarder <jrdr.linux@gmail.com>

    [ Upstream commit c9d7e3da1f3c4cf5dddfc5d7ce4d76d013aba1cc ]

    Corrected error handling goto sequnece. Level put_pages should
    be called when pinned pages >= 0 && pinned != npages. Level
    free_pages should be called when pinned pages < 0.

    Fixes: fa8dda1edef9 ("fpga: dfl: afu: add DFL_FPGA_PORT_DMA_MAP/UNMAP ioctls support")
    Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
    Acked-by: Wu Hao <hao.wu@intel.com>
    Reviewed-by: Xu Yilun <yilun.xu@intel.com>
    Link: https://lore.kernel.org/r/1589825991-3545-1-git-send-email-jrdr.linux@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/fpga/dfl-afu-dma-region.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c
    index 62f924489db59..5942343a5d6ea 100644
    --- a/drivers/fpga/dfl-afu-dma-region.c
    +++ b/drivers/fpga/dfl-afu-dma-region.c
    @@ -61,10 +61,10 @@ static int afu_dma_pin_pages(struct dfl_feature_platform_data *pdata,
    region->pages);
    if (pinned < 0) {
    ret = pinned;
    - goto put_pages;
    + goto free_pages;
    } else if (pinned != npages) {
    ret = -EFAULT;
    - goto free_pages;
    + goto put_pages;
    }

    dev_dbg(dev, "%d pages pinned\n", pinned);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:28    [W:4.098 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site