Skip to content

Commit

Permalink
net: mdio-octeon: Fix octeon_mdiobus_probe function for return values
Browse files Browse the repository at this point in the history
This patch fixes a possible crash in the octeon_mdiobus_probe function
if the return values are not handled properly.

Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Radha Mohan Chintakuntla authored and David S. Miller committed Jul 30, 2015
1 parent a6d6786 commit de9e397
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/net/phy/mdio-octeon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit de9e397

Please sign in to comment.