Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1305304

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

Show all headers | View raw

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@lunn.ch>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH -next 1/2] net: bfin_mac: Fix error handling in probe function Guenter Roeck <linux@roeck-us.net> - 2016-01-09 17:40 +0100
  [PATCH -next 2/2] net: bfin_mac: Fix build error due to missed API change Guenter Roeck <linux@roeck-us.net> - 2016-01-09 17:40 +0100
  Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Andrew Lunn <andrew@lunn.ch> - 2016-01-09 18:00 +0100
    Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Guenter Roeck <linux@roeck-us.net> - 2016-01-09 19:20 +0100
      Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Andrew Lunn <andrew@lunn.ch> - 2016-01-09 22:00 +0100
        Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Guenter Roeck <linux@roeck-us.net> - 2016-01-10 16:20 +0100
          Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Andrew Lunn <andrew@lunn.ch> - 2016-01-10 17:00 +0100
            Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Guenter Roeck <linux@roeck-us.net> - 2016-01-10 17:30 +0100
              Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Andrew Lunn <andrew@lunn.ch> - 2016-01-10 18:30 +0100
                Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Guenter Roeck <linux@roeck-us.net> - 2016-01-10 21:20 +0100
                Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Andrew Lunn <andrew@lunn.ch> - 2016-01-11 01:00 +0100
          Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-01-11 09:50 +0100
            Re: [PATCH -next 1/2] net: bfin_mac: Fix error handling in probe  function Guenter Roeck <linux@roeck-us.net> - 2016-01-11 17:30 +0100

csiph-web