Message ID | trinity-ddc3de71-4149-43ad-8e8c-99edf092a769-1726082664469@3c-app-gmx-bs04 (mailing list archive) |
---|---|
State | Changes Requested |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: tn40xx: add support for AQR105 based cards (was: net: phy: aquantia: emable firmware loading for aqr105) | expand |
diff --git a/drivers/net/phy/aquantia/aquantia_firmware.c b/drivers/net/phy/aquantia/aquantia_firmware.c index 524627a36c6f..090fcc9a3413 100644 --- a/drivers/net/phy/aquantia/aquantia_firmware.c +++ b/drivers/net/phy/aquantia/aquantia_firmware.c @@ -354,7 +354,7 @@ int aqr_firmware_load(struct phy_device *phydev) int ret; ret = aqr_wait_reset_complete(phydev); - if (ret) + if (ret != -ETIMEDOUT) return ret; /* Check if the firmware is not already loaded by pooling
Allow firmware loading from nvmem or fs. As discussed in https://lore.kernel.org/netdev/20240806112747.soclko5vex2f2c64@skbuf/ the return value -ETIMEDOUT (returned by aqr_wait_reset_complete when the firmware version is still 0 after 2s) needs to be let through. Otherwise, this will prevent loading of an external firmware. Signed-off-by: Hans-Frieder Vogt <hfdevel@gmx.net> --- drivers/net/phy/aquantia/aquantia_firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.45.2