Commit 42b5adbb authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: dsa: felix: don't deinitialize unused ports

ocelot_init_port is called only if dsa_is_unused_port == false, however
ocelot_deinit_port is called unconditionally. This causes a warning in
the skb_queue_purge inside ocelot_deinit_port saying that the spin lock
protecting ocelot_port->tx_skbs was not initialized.

Fixes: e5fb512d ("net: mscc: ocelot: deinitialize only initialized ports")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6825a456
...@@ -1262,8 +1262,12 @@ static void felix_teardown(struct dsa_switch *ds) ...@@ -1262,8 +1262,12 @@ static void felix_teardown(struct dsa_switch *ds)
ocelot_deinit_timestamp(ocelot); ocelot_deinit_timestamp(ocelot);
ocelot_deinit(ocelot); ocelot_deinit(ocelot);
for (port = 0; port < ocelot->num_phys_ports; port++) for (port = 0; port < ocelot->num_phys_ports; port++) {
if (dsa_is_unused_port(ds, port))
continue;
ocelot_deinit_port(ocelot, port); ocelot_deinit_port(ocelot, port);
}
if (felix->info->mdio_bus_free) if (felix->info->mdio_bus_free)
felix->info->mdio_bus_free(ocelot); felix->info->mdio_bus_free(ocelot);
......
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