Re: [PATCH] net: r6040: Return proper error for r6040_init_one
flat view
From: Florian Fainelli <florian@openwrt.org>
Date: 2011-01-05 09:50:01
Also in:
lkml
On Wednesday 05 January 2011 09:40:04 Axel Lin wrote:
Return -ENOMEM instead of 0 for the case of mdiobus_alloc and kmalloc failure. Signed-off-by: Axel Lin <redacted>
Acked-by: Florian Fainelli <florian@openwrt.org>
quoted hunk ↗ jump to hunk
--- drivers/net/r6040.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 0b014c89..27e6f6d 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c@@ -1153,6 +1153,7 @@ static int __devinit r6040_init_one(struct pci_dev*pdev, lp->mii_bus = mdiobus_alloc(); if (!lp->mii_bus) { dev_err(&pdev->dev, "mdiobus_alloc() failed\n"); + err = -ENOMEM; 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); if (!lp->mii_bus->irq) { dev_err(&pdev->dev, "mii_bus irq allocation failed\n"); + err = -ENOMEM; goto err_out_mdio; }