Skip to content

Commit a6c121a

Browse files
robimarkokuba-moo
authored andcommitted
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: e93984e ("net: phy: aquantia: add firmware load support") Signed-off-by: Robert Marko <[email protected]> Reviewed-by: Russell King (Oracle) <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1f73a56 commit a6c121a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/phy/aquantia/aquantia_firmware.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ int aqr_firmware_load(struct phy_device *phydev)
369369
* assume that, and load a new image.
370370
*/
371371
ret = aqr_firmware_load_nvmem(phydev);
372-
if (!ret)
372+
if (ret == -EPROBE_DEFER || !ret)
373373
return ret;
374374

375375
ret = aqr_firmware_load_fs(phydev);

0 commit comments

Comments
 (0)