net: mdio-octeon: Fix crash on failure in octeon_mdiobus_probe()

This patch fixes a possible crash in the octeon_mdiobus_probe
function. On failure we may not write to the dev as long as we did not
ioremap yet.

Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev@caviumnetworks.com>

diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
index c838ad6155f7863cbed177f35c4416fad1c0ddb5..c20017e4141ae48c0e4ad7231a801f6b69fc39ac 100644 (file)
--- a/drivers/net/phy/mdio-octeon.c
+++ b/drivers/net/phy/mdio-octeon.c
@@ -187,24 +187,28 @@ static int octeon_mdiobus_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
        if (res_mem == NULL) {
                dev_err(&pdev->dev, "found no memory resource\n");
-               err = -ENXIO;
-               goto fail;
+               return -ENXIO;
        }
+
        bus->mdio_phys = res_mem->start;
        bus->regsize = resource_size(res_mem);
+
        if (!devm_request_mem_region(&pdev->dev, bus->mdio_phys, bus->regsize,
                                     res_mem->name)) {
                dev_err(&pdev->dev, "request_mem_region failed\n");
-               goto fail;
+               return -ENXIO;
        }
+
        bus->register_base =
                (u64)devm_ioremap(&pdev->dev, bus->mdio_phys, bus->regsize);
+       if (!bus->register_base) {
+               dev_err(&pdev->dev, "dev_ioremap failed\n");
+               return -ENOMEM;
+       }
 
        bus->mii_bus = mdiobus_alloc();
-
        if (!bus->mii_bus)
                goto fail;