Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: ethernet: dwc_eth_qos: fix fixed-link phydev leaks

Make sure to deregister and free any fixed-link PHY registered using
of_phy_register_fixed_link() on probe errors and on driver unbind.

Fixes: 077742dac2c7 ("dwc_eth_qos: Add support for Synopsys DWC Ethernet
QoS")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Johan Hovold and committed by
David S. Miller
c41a4767 9f70eb33

+13 -7
+13 -7
drivers/net/ethernet/synopsys/dwc_eth_qos.c
··· 2881 2881 ret = of_get_phy_mode(lp->pdev->dev.of_node); 2882 2882 if (ret < 0) { 2883 2883 dev_err(&lp->pdev->dev, "error in getting phy i/f\n"); 2884 - goto err_out_clk_dis_phy; 2884 + goto err_out_deregister_fixed_link; 2885 2885 } 2886 2886 2887 2887 lp->phy_interface = ret; ··· 2889 2889 ret = dwceqos_mii_init(lp); 2890 2890 if (ret) { 2891 2891 dev_err(&lp->pdev->dev, "error in dwceqos_mii_init\n"); 2892 - goto err_out_clk_dis_phy; 2892 + goto err_out_deregister_fixed_link; 2893 2893 } 2894 2894 2895 2895 ret = dwceqos_mii_probe(ndev); 2896 2896 if (ret != 0) { 2897 2897 netdev_err(ndev, "mii_probe fail.\n"); 2898 2898 ret = -ENXIO; 2899 - goto err_out_clk_dis_phy; 2899 + goto err_out_deregister_fixed_link; 2900 2900 } 2901 2901 2902 2902 dwceqos_set_umac_addr(lp, lp->ndev->dev_addr, 0); ··· 2914 2914 if (ret) { 2915 2915 dev_err(&lp->pdev->dev, "Unable to retrieve DT, error %d\n", 2916 2916 ret); 2917 - goto err_out_clk_dis_phy; 2917 + goto err_out_deregister_fixed_link; 2918 2918 } 2919 2919 dev_info(&lp->pdev->dev, "pdev->id %d, baseaddr 0x%08lx, irq %d\n", 2920 2920 pdev->id, ndev->base_addr, ndev->irq); ··· 2924 2924 if (ret) { 2925 2925 dev_err(&lp->pdev->dev, "Unable to request IRQ %d, error %d\n", 2926 2926 ndev->irq, ret); 2927 - goto err_out_clk_dis_phy; 2927 + goto err_out_deregister_fixed_link; 2928 2928 } 2929 2929 2930 2930 if (netif_msg_probe(lp)) ··· 2935 2935 ret = register_netdev(ndev); 2936 2936 if (ret) { 2937 2937 dev_err(&pdev->dev, "Cannot register net device, aborting.\n"); 2938 - goto err_out_clk_dis_phy; 2938 + goto err_out_deregister_fixed_link; 2939 2939 } 2940 2940 2941 2941 return 0; 2942 2942 2943 + err_out_deregister_fixed_link: 2944 + if (of_phy_is_fixed_link(pdev->dev.of_node)) 2945 + of_phy_deregister_fixed_link(pdev->dev.of_node); 2943 2946 err_out_clk_dis_phy: 2944 2947 clk_disable_unprepare(lp->phy_ref_clk); 2945 2948 err_out_clk_dis_aper: ··· 2962 2959 if (ndev) { 2963 2960 lp = netdev_priv(ndev); 2964 2961 2965 - if (ndev->phydev) 2962 + if (ndev->phydev) { 2966 2963 phy_disconnect(ndev->phydev); 2964 + if (of_phy_is_fixed_link(pdev->dev.of_node)) 2965 + of_phy_deregister_fixed_link(pdev->dev.of_node); 2966 + } 2967 2967 mdiobus_unregister(lp->mii_bus); 2968 2968 mdiobus_free(lp->mii_bus); 2969 2969