lkml.org 
[lkml]   [2021]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 13/30] NIU: fix incorrect error return, missed in previous revert
    Date
    From: Paul Jakma <paul@jakma.org>

    commit 15bbf8bb4d4ab87108ecf5f4155ec8ffa3c141d6 upstream.

    Commit 7930742d6, reverting 26fd962, missed out on reverting an incorrect
    change to a return value. The niu_pci_vpd_scan_props(..) == 1 case appears
    to be a normal path - treating it as an error and return -EINVAL was
    breaking VPD_SCAN and causing the driver to fail to load.

    Fix, so my Neptune card works again.

    Cc: Kangjie Lu <kjlu@umn.edu>
    Cc: Shannon Nelson <shannon.lee.nelson@gmail.com>
    Cc: David S. Miller <davem@davemloft.net>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: stable <stable@vger.kernel.org>
    Fixes: 7930742d ('Revert "niu: fix missing checks of niu_pci_eeprom_read"')
    Signed-off-by: Paul Jakma <paul@jakma.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/sun/niu.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/ethernet/sun/niu.c
    +++ b/drivers/net/ethernet/sun/niu.c
    @@ -8192,8 +8192,9 @@ static int niu_pci_vpd_fetch(struct niu
    err = niu_pci_vpd_scan_props(np, here, end);
    if (err < 0)
    return err;
    + /* ret == 1 is not an error */
    if (err == 1)
    - return -EINVAL;
    + return 0;
    }
    return 0;
    }

    \
     
     \ /
      Last update: 2021-08-02 16:12    [W:4.165 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site