From: Markus Elfring <[email protected]> Date: Fri, 20 Sep 2019 20:42:42 +0200
Move the modification of some members in the data structure “mii_bus” for the local variable “bus” directly before the call of the function “of_mdiobus_register” so that this change will be performed only after previous resource allocations succeeded. Signed-off-by: Markus Elfring <[email protected]> --- drivers/net/phy/mdio-mscc-miim.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/mdio-mscc-miim.c b/drivers/net/phy/mdio-mscc-miim.c index b36fe81b6e6d..c46e0c78402e 100644 --- a/drivers/net/phy/mdio-mscc-miim.c +++ b/drivers/net/phy/mdio-mscc-miim.c @@ -123,13 +123,6 @@ static int mscc_miim_probe(struct platform_device *pdev) if (!bus) return -ENOMEM; - bus->name = "mscc_miim"; - bus->read = mscc_miim_read; - bus->write = mscc_miim_write; - bus->reset = mscc_miim_reset; - snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(&pdev->dev)); - bus->parent = &pdev->dev; - dev = bus->priv; dev->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(dev->regs)) { @@ -143,6 +136,12 @@ static int mscc_miim_probe(struct platform_device *pdev) return PTR_ERR(dev->phy_regs); } + bus->name = "mscc_miim"; + bus->read = mscc_miim_read; + bus->write = mscc_miim_write; + bus->reset = mscc_miim_reset; + snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(&pdev->dev)); + bus->parent = &pdev->dev; ret = of_mdiobus_register(bus, pdev->dev.of_node); if (ret < 0) { dev_err(&pdev->dev, "Cannot register MDIO bus (%d)\n", ret); -- 2.23.0
