diff options
| author | Radha Mohan Chintakuntla <rchintakuntla@cavium.com> | 2015-07-29 00:12:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-30 02:17:44 +0200 |
| commit | de9e397e40f56b9f34af4bf6a5bd7a75ea02456c (patch) | |
| tree | c3ba6f411ce222f8f74e3e0e5b45d681e451e2d3 /drivers | |
| parent | net: mdio-octeon: Modify driver to work on both ThunderX and Octeon (diff) | |
| download | linux-de9e397e40f56b9f34af4bf6a5bd7a75ea02456c.tar.xz linux-de9e397e40f56b9f34af4bf6a5bd7a75ea02456c.zip | |
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: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/mdio-octeon.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c index 1509937e93c0..fcf4e4df7cc8 100644 --- a/drivers/net/phy/mdio-octeon.c +++ b/drivers/net/phy/mdio-octeon.c @@ -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; |