Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de9e397e authored by Radha Mohan Chintakuntla's avatar Radha Mohan Chintakuntla Committed by David S. Miller
Browse files

net: mdio-octeon: Fix octeon_mdiobus_probe function for return values 



This patch fixes a possible crash in the octeon_mdiobus_probe function
if the return values are not handled properly.

Signed-off-by: default avatarRadha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: default avatarTomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6d67864

drivers/net/phy/mdio-octeon.c

+9 −5
Original line number Diff line number Diff line
@@ -277,24 +277,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;