Commit b5947239 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: failure to probe without MAC interface specified 



Alexander Stein reports that commit a014c355 ("net: stmmac: clarify
difference between "interface" and "phy_interface"") caused breakage,
because plat->mac_interface will never be negative. Fix this by using
the "rc" temporary variable in stmmac_probe_config_dt().

Reported-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/E1qayn0-006Q8J-GE@rmk-PC.armlinux.org.uk


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

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+2 −3
Original line number Diff line number Diff line
@@ -419,9 +419,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) 
		return ERR_PTR(phy_mode);



	plat->phy_interface = phy_mode;

	plat->mac_interface = stmmac_of_get_mac_mode(np);

	if (plat->mac_interface < 0)

		plat->mac_interface = plat->phy_interface;

	rc = stmmac_of_get_mac_mode(np);

	plat->mac_interface = rc < 0 ? plat->phy_interface : rc;



	/* Some wrapper drivers still rely on phy_node. Let's save it while

	 * they are not converted to phylink. */