mdio: mux: avoid 'maybe-uninitialized' warning

The latest changes to the MDIO code introduced a false-positive
warning with gcc-6 (possibly others):

drivers/net/phy/mdio-mux.c: In function 'mdio_mux_init':
drivers/net/phy/mdio-mux.c:188:3: error: 'parent_bus_node' may be used uninitialized in this function [-Werror=maybe-uninitialized]

It's easy to avoid the warning by making sure the parent_bus_node
is initialized in both cases at the start of the function, since
the later 'of_node_put()' call is also valid for a NULL pointer
argument.

Signed-off-by: Arnd Bergmann <[email protected]>
Fixes: f20e6657a875 ("mdio: mux: Enhanced MDIO mux framework for integrated multiplexers")
Reviewed-by: Andrew Lunn <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
index dbd4ecc205dc74a02aefe5edc1a4c3251e0e7757..963838d4fac12428e0c01f88537a72b4a2fd8703 100644 (file)
--- a/drivers/net/phy/mdio-mux.c
+++ b/drivers/net/phy/mdio-mux.c
@@ -115,6 +115,7 @@ int mdio_mux_init(struct device *dev,
                        goto err_parent_bus;
                }
        } else {
+               parent_bus_node = NULL;
                parent_bus = mux_bus;
        }
 
@@ -184,8 +185,7 @@ int mdio_mux_init(struct device *dev,
        put_device(&pb->mii_bus->dev);
 
 err_parent_bus:
-       if (!mux_bus)
-               of_node_put(parent_bus_node);
+       of_node_put(parent_bus_node);
        return ret_val;
 }
 EXPORT_SYMBOL_GPL(mdio_mux_init);