aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa
diff options
context:
space:
mode:
authorColin Foster <colin.foster@in-advantage.com>2021-12-07 09:00:28 -0800
committerJakub Kicinski <kuba@kernel.org>2021-12-07 21:44:49 -0800
commit49af6a7620c53b779572abfbfd7778e113154330 (patch)
tree3cd935a8f9905f4975bb652b0cd8db4f6306b558 /drivers/net/dsa
parentnet: dsa: ocelot: remove unnecessary pci_bar variables (diff)
downloadlinux-dev-49af6a7620c53b779572abfbfd7778e113154330.tar.xz
linux-dev-49af6a7620c53b779572abfbfd7778e113154330.zip
net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Existing felix devices all have an initialized pcs array. Future devices might not, so running a NULL check on the array before dereferencing it will allow those future drivers to not crash at this point Signed-off-by: Colin Foster <colin.foster@in-advantage.com> Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/dsa')
-rw-r--r--drivers/net/dsa/ocelot/felix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 0e102caddb73..4ead3ebe947b 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -828,7 +828,7 @@ static void felix_phylink_mac_config(struct dsa_switch *ds, int port,
struct felix *felix = ocelot_to_felix(ocelot);
struct dsa_port *dp = dsa_to_port(ds, port);
- if (felix->pcs[port])
+ if (felix->pcs && felix->pcs[port])
phylink_set_pcs(dp->pl, &felix->pcs[port]->pcs);
}