Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe function

From: Andrew Lunn
Date: Sat Jan 09 2016 - 11:58:17 EST


Hi Guenter

Same fix was submitted yesterday by Sudip Mukherjee.

Thanks
Andrew


On Sat, Jan 09, 2016 at 08:37:06AM -0800, Guenter Roeck wrote:
> Commit e7f4dc3536a4 ("mdio: Move allocation of interrupts into core")
> removed interrupt allocation code. While doing so, error handling got
> messed up a bit, resulting in the following build warning and a missed
> call to mdiobus_free() in the probe function error path.
>
> drivers/net/ethernet/adi/bfin_mac.c: In function 'bfin_mii_bus_probe':
> drivers/net/ethernet/adi/bfin_mac.c:1865:1: warning:
> label 'out_err_irq_alloc' defined but not used
>
> Fixes: e7f4dc3536a4 ("mdio: Move allocation of interrupts into core")
> Cc: Andrew Lunn <andrew@xxxxxxx>
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/net/ethernet/adi/bfin_mac.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
> index 62862744c870..8c5132624510 100644
> --- a/drivers/net/ethernet/adi/bfin_mac.c
> +++ b/drivers/net/ethernet/adi/bfin_mac.c
> @@ -1856,13 +1856,13 @@ static int bfin_mii_bus_probe(struct platform_device *pdev)
> rc = mdiobus_register(miibus);
> if (rc) {
> dev_err(&pdev->dev, "Cannot register MDIO bus!\n");
> - goto out_err_alloc;
> + goto out_err_mdiobus_register;
> }
>
> platform_set_drvdata(pdev, miibus);
> return 0;
>
> -out_err_irq_alloc:
> +out_err_mdiobus_register:
> mdiobus_free(miibus);
> out_err_alloc:
> peripheral_free_list(pin_req);
> --
> 2.1.4
>