| Message ID | 20210723151304.1258531-1-paul@jakma.org |
|---|---|
| State | New |
| Headers | show |
| Series | NIU: fix incorrect error return, missed in previous revert | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 23 Jul 2021 16:13:04 +0100 you wrote: > 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. > > [...] Here is the summary with links: - NIU: fix incorrect error return, missed in previous revert https://git.kernel.org/netdev/net/c/15bbf8bb4d4a You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 74e748662ec0..860644d182ab 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -8191,8 +8191,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; }
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> --- drivers/net/ethernet/sun/niu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)