| Message ID | 99d70634a81c229885ae9e4ee69b2035749f7edc.1652634040.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ef6b1cd11962aec21c58d137006ab122dbc8d6fd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: systemport: Fix an error handling path in bcm_sysport_probe() | expand |
On 5/15/2022 10:01 AM, Christophe JAILLET wrote: > if devm_clk_get_optional() fails, we still need to go through the error > handling path. > > Add the missing goto. > > Fixes: 6328a126896ea ("net: systemport: Manage Wake-on-LAN clock") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Hello: This patch was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Sun, 15 May 2022 19:01:56 +0200 you wrote: > if devm_clk_get_optional() fails, we still need to go through the error > handling path. > > Add the missing goto. > > Fixes: 6328a126896ea ("net: systemport: Manage Wake-on-LAN clock") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > [...] Here is the summary with links: - net: systemport: Fix an error handling path in bcm_sysport_probe() https://git.kernel.org/netdev/net/c/ef6b1cd11962 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index f1805fb857c5..47fc8e6963d5 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -2581,8 +2581,10 @@ static int bcm_sysport_probe(struct platform_device *pdev) device_set_wakeup_capable(&pdev->dev, 1); priv->wol_clk = devm_clk_get_optional(&pdev->dev, "sw_sysportwol"); - if (IS_ERR(priv->wol_clk)) - return PTR_ERR(priv->wol_clk); + if (IS_ERR(priv->wol_clk)) { + ret = PTR_ERR(priv->wol_clk); + goto err_deregister_fixed_link; + } /* Set the needed headroom once and for all */ BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);
if devm_clk_get_optional() fails, we still need to go through the error handling path. Add the missing goto. Fixes: 6328a126896ea ("net: systemport: Manage Wake-on-LAN clock") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/net/ethernet/broadcom/bcmsysport.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)