diff options
| author | Paul Jakma <paul@jakma.org> | 2021-07-23 16:13:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-04 12:23:45 +0200 |
| commit | 4cd2534cbf6f5986682c12f4a6881fb2fe065e50 (patch) | |
| tree | 2b198d55830f11d50cba1f00b7f3f977942540b2 | |
| parent | 9c9e45112c2331d1a873fba92678b497977fb1e5 (diff) | |
| download | linux-stable-4cd2534cbf6f5986682c12f4a6881fb2fe065e50.tar.gz linux-stable-4cd2534cbf6f5986682c12f4a6881fb2fe065e50.tar.bz2 linux-stable-4cd2534cbf6f5986682c12f4a6881fb2fe065e50.zip | |
NIU: fix incorrect error return, missed in previous revert
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>
| -rw-r--r-- | drivers/net/ethernet/sun/niu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 5894edf79d65..605c4d15b88c 100644 --- 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 *np, u32 start) 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; } |