The revert of commit 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 it, 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 Fixes: 7930742d ('Revert "niu: fix missing checks of niu_pci_eeprom_read"') Cc: stable stable@vger.kernel.org Signed-off-by: Paul Jakma paul@jakma.org ---
--- e6e337708c22f80824b82d4af645f20715730ad0/drivers/net/ethernet/sun/niu.c 2021-07-20 20:51:52.054770659 +0100 +++ fix/drivers/net/ethernet/sun/niu.c 2021-07-20 20:49:02.194870695 +0100 @@ -8192,7 +8192,7 @@ if (err < 0) return err; if (err == 1) - return -EINVAL; + return 0; } return 0; }
From: Paul Jakma paul@jakma.org Date: Tue, 20 Jul 2021 21:10:37 +0100 (BST)
The revert of commit 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 it, 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 Fixes: 7930742d ('Revert "niu: fix missing checks of niu_pci_eeprom_read"') Cc: stable stable@vger.kernel.org Signed-off-by: Paul Jakma paul@jakma.org
This does not apply to the current networking GIT tree, what tree is it against?
Thank you.
linux-stable-mirror@lists.linaro.org
-
David Miller -
Paul Jakma