Commit a6c121a2 authored by Robert Marko's avatar Robert Marko Committed by Jakub Kicinski
Browse files

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: e93984eb ("net: phy: aquantia: add firmware load support")
Signed-off-by: default avatarRobert Marko <robimarko@gmail.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/20251127114514.460924-1-robimarko@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1f73a56f

drivers/net/phy/aquantia/aquantia_firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -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);