mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
net: r6040: Return proper error for r6040_init_one
Return -ENOMEM instead of 0 for the case of mdiobus_alloc and kmalloc failure. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2a8fe00374
commit
9c86c0f4ba
1 changed files with 2 additions and 0 deletions
|
@ -1153,6 +1153,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
|
||||||
lp->mii_bus = mdiobus_alloc();
|
lp->mii_bus = mdiobus_alloc();
|
||||||
if (!lp->mii_bus) {
|
if (!lp->mii_bus) {
|
||||||
dev_err(&pdev->dev, "mdiobus_alloc() failed\n");
|
dev_err(&pdev->dev, "mdiobus_alloc() failed\n");
|
||||||
|
err = -ENOMEM;
|
||||||
goto err_out_unmap;
|
goto err_out_unmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1165,6 +1166,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
|
||||||
lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
|
lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
|
||||||
if (!lp->mii_bus->irq) {
|
if (!lp->mii_bus->irq) {
|
||||||
dev_err(&pdev->dev, "mii_bus irq allocation failed\n");
|
dev_err(&pdev->dev, "mii_bus irq allocation failed\n");
|
||||||
|
err = -ENOMEM;
|
||||||
goto err_out_mdio;
|
goto err_out_mdio;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue