2 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
index e0cc4ef33dee..eefe49e8713c 100644
--- a/drivers/net/phy/mdio-mux-gpio.c
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -101,7 +101,6 @@ err:
                 n--;
                 gpio_free(s->gpio[n]);
         }
-        devm_kfree(&pdev->dev, s);
         return r;
 }
 
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
index 5c120189ec86..4d4d25efc1e1 100644
--- a/drivers/net/phy/mdio-mux.c
+++ b/drivers/net/phy/mdio-mux.c
@@ -132,7 +132,7 @@ int mdio_mux_init(struct device *dev,
         pb->mii_bus = parent_bus;
 
         ret_val = -ENODEV;
-        for_each_child_of_node(dev->of_node, child_bus_node) {
+        for_each_available_child_of_node(dev->of_node, child_bus_node) {
                 u32 v;
 
                 r = of_property_read_u32(child_bus_node, "reg", &v);