diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-21 11:06:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-21 11:06:07 -0800 |
| commit | 462a1196a578fc6f52c26427070a75e044bbf9b1 (patch) | |
| tree | b24eca93de7e557d35b2da873efb2603ef79ce03 /drivers/net/phy/mdio-mux.c | |
| parent | 58362d5be35216f196b4a4d16aa2c6ef938087f0 (diff) | |
| parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
| download | linux-462a1196a578fc6f52c26427070a75e044bbf9b1.tar.gz linux-462a1196a578fc6f52c26427070a75e044bbf9b1.tar.bz2 linux-462a1196a578fc6f52c26427070a75e044bbf9b1.zip | |
Merge 4.4-rc6 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/phy/mdio-mux.c')
| -rw-r--r-- | drivers/net/phy/mdio-mux.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c index 908e8d486342..7f8e7662e28c 100644 --- a/drivers/net/phy/mdio-mux.c +++ b/drivers/net/phy/mdio-mux.c @@ -149,9 +149,14 @@ int mdio_mux_init(struct device *dev, } cb->bus_number = v; cb->parent = pb; + cb->mii_bus = mdiobus_alloc(); + if (!cb->mii_bus) { + ret_val = -ENOMEM; + of_node_put(child_bus_node); + break; + } cb->mii_bus->priv = cb; - cb->mii_bus->irq = cb->phy_irq; cb->mii_bus->name = "mdio_mux"; snprintf(cb->mii_bus->id, MII_BUS_ID_SIZE, "%x.%x", |