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@xxxxxxx>
Cc: Shannon Nelson <shannon.lee.nelson@xxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Fixes: 7930742d ('Revert "niu: fix missing checks of niu_pci_eeprom_read"')
Cc: stable <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Paul Jakma <paul@xxxxxxxxx>
---
--- 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;
}
--
Paul Jakma | paul@xxxxxxxxx | @pjakma | Key ID: 0xD86BF79464A2FF6A
Fortune:
How sharper than a serpent's tooth is a sister's "See?"
-- Linus Van Pelt
