[openwrt/openwrt] ath79: ag71xx: fix error handling for of_get_phy_mode

LEDE Commits lede-commits at lists.infradead.org
Sun May 9 16:20:07 PDT 2021


blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a273ac4d610b95de213fc89c713bcf1b4b851b2d

commit a273ac4d610b95de213fc89c713bcf1b4b851b2d
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Mon May 3 00:27:59 2021 +0200

    ath79: ag71xx: fix error handling for of_get_phy_mode
    
    Errors are not indicated by the phy_mode value but returned separately
    from the function.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 .../ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index d060568593..463083628f 100644
--- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -1677,12 +1677,12 @@ static int ag71xx_probe(struct platform_device *pdev)
 	}
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)
-	of_get_phy_mode(np, &ag->phy_if_mode);
+	err = of_get_phy_mode(np, &ag->phy_if_mode);
+	if (err < 0) {
 #else
 	ag->phy_if_mode = of_get_phy_mode(np);
-#endif
-
 	if (ag->phy_if_mode < 0) {
+#endif
 		dev_err(&pdev->dev, "missing phy-mode property in DT\n");
 		return ag->phy_if_mode;
 	}



More information about the lede-commits mailing list