diff options
| author | Robert Marko <robimarko@gmail.com> | 2025-11-27 14:44:35 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-12-18 15:55:12 +0300 |
| commit | b7e669dce505ac24a8a54ca8a0ea0fd9ac4cb8da (patch) | |
| tree | 9dae7e3e4464692b8b3bcde9dcc8b058da15bcbb /drivers/net/phy | |
| parent | 45d7cf5174e4b9ceda4f77976c2bcab5f96477c2 (diff) | |
| download | linux-b7e669dce505ac24a8a54ca8a0ea0fd9ac4cb8da.tar.xz | |
net: phy: aquantia: check for NVMEM deferral
[ Upstream commit a6c121a2432eee2c4ebceb1483ccd4a50a52983d ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/aquantia/aquantia_firmware.c | 2 |
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 dab3af80593f..33b8c7676fb3 100644 --- a/drivers/net/phy/aquantia/aquantia_firmware.c +++ b/drivers/net/phy/aquantia/aquantia_firmware.c @@ -368,7 +368,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); |