Commit 2d683eaa authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller

net: cpsw: fix NULL pointer exception in the probe error path

In certain cases when the probe function fails the error path calls
cpsw_remove_dt() before calling platform_set_drvdata(). This is an
issue as cpsw_remove_dt() uses platform_get_drvdata() to retrieve the
cpsw_common data and leds to a NULL pointer exception. This patches
fixes it by calling platform_set_drvdata() earlier in the probe.

Fixes: 83a8471b ("net: ethernet: ti: cpsw: refactor probe to group common hw initialization")
Reported-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e2866a9
...@@ -2775,6 +2775,7 @@ static int cpsw_probe(struct platform_device *pdev) ...@@ -2775,6 +2775,7 @@ static int cpsw_probe(struct platform_device *pdev)
if (!cpsw) if (!cpsw)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, cpsw);
cpsw->dev = dev; cpsw->dev = dev;
mode = devm_gpiod_get_array_optional(dev, "mode", GPIOD_OUT_LOW); mode = devm_gpiod_get_array_optional(dev, "mode", GPIOD_OUT_LOW);
...@@ -2879,7 +2880,6 @@ static int cpsw_probe(struct platform_device *pdev) ...@@ -2879,7 +2880,6 @@ static int cpsw_probe(struct platform_device *pdev)
goto clean_cpts; goto clean_cpts;
} }
platform_set_drvdata(pdev, cpsw);
priv = netdev_priv(ndev); priv = netdev_priv(ndev);
priv->cpsw = cpsw; priv->cpsw = cpsw;
priv->ndev = ndev; priv->ndev = ndev;
......
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