Commit bb9c0fa3 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: bcm_sf2: Unwind errors in correct order

In case we cannot complete bcm_sf2_sw_setup() for any reason, and we
go to the out_unmap label, but the MDIO bus has not been registered yet,
we will hit the BUG condition in drivers/net/phy/mdio_bus.c about the
bus not being registered. Fix this by dedicating a specific lable for
when we fail after the MDIO bus has been successfully registered.

Fixes: 461cd1b0 ("net: dsa: bcm_sf2: Register our slave MDIO bus")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33c77efb
...@@ -1622,7 +1622,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) ...@@ -1622,7 +1622,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
"switch_0", priv); "switch_0", priv);
if (ret < 0) { if (ret < 0) {
pr_err("failed to request switch_0 IRQ\n"); pr_err("failed to request switch_0 IRQ\n");
goto out_unmap; goto out_mdio;
} }
ret = request_irq(priv->irq1, bcm_sf2_switch_1_isr, 0, ret = request_irq(priv->irq1, bcm_sf2_switch_1_isr, 0,
...@@ -1679,6 +1679,8 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) ...@@ -1679,6 +1679,8 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
out_free_irq0: out_free_irq0:
free_irq(priv->irq0, priv); free_irq(priv->irq0, priv);
out_mdio:
bcm_sf2_mdio_unregister(priv);
out_unmap: out_unmap:
base = &priv->core; base = &priv->core;
for (i = 0; i < BCM_SF2_REGS_NUM; i++) { for (i = 0; i < BCM_SF2_REGS_NUM; i++) {
...@@ -1686,7 +1688,6 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) ...@@ -1686,7 +1688,6 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
iounmap(*base); iounmap(*base);
base++; base++;
} }
bcm_sf2_mdio_unregister(priv);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment