aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRobert Marko <robimarko@gmail.com>2025-11-27 12:44:35 +0100
committerJakub Kicinski <kuba@kernel.org>2025-11-28 19:40:42 -0800
commita6c121a2432eee2c4ebceb1483ccd4a50a52983d (patch)
tree2ad90108c42c508f6ee5ae13da7573319490cf14 /drivers
parent1f73a56f986005f0bc64ed23873930e2ee4f5911 (diff)
downloadnet-a6c121a2432eee2c4ebceb1483ccd4a50a52983d.tar.gz
net: phy: aquantia: check for NVMEM deferral
Currently, if NVMEM provider is probed later than Aquantia, loading the firmware will fail with -EINVAL. To fix this, simply check for -EPROBE_DEFER when NVMEM is attempted and return it. Fixes: e93984ebc1c8 ("net: phy: aquantia: add firmware load support") Signed-off-by: Robert Marko <robimarko@gmail.com> Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/20251127114514.460924-1-robimarko@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/aquantia/aquantia_firmware.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/aquantia/aquantia_firmware.c b/drivers/net/phy/aquantia/aquantia_firmware.c
index bbbcc9736b00e1..569256152689f8 100644
--- a/drivers/net/phy/aquantia/aquantia_firmware.c
+++ b/drivers/net/phy/aquantia/aquantia_firmware.c
@@ -369,7 +369,7 @@ int aqr_firmware_load(struct phy_device *phydev)
* assume that, and load a new image.
*/
ret = aqr_firmware_load_nvmem(phydev);
- if (!ret)
+ if (ret == -EPROBE_DEFER || !ret)
return ret;
ret = aqr_firmware_load_fs(phydev);