Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 764498fa authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Greg Kroah-Hartman
Browse files

net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe() 



[ Upstream commit e928b5d6b75e239feb9c6d5488974b6646a0ebc8 ]

If mv643xx_eth_shared_of_probe() fails, mv643xx_eth_shared_probe()
leaves clk enabled.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0b6f466d

drivers/net/ethernet/marvell/mv643xx_eth.c

+6 −1
Original line number Diff line number Diff line
@@ -2884,7 +2884,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) 


	ret = mv643xx_eth_shared_of_probe(pdev);

	if (ret)

		return ret;

		goto err_put_clk;

	pd = dev_get_platdata(&pdev->dev);



	msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ?
@@ -2892,6 +2892,11 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) 
	infer_hw_params(msp);



	return 0;



err_put_clk:

	if (!IS_ERR(msp->clk))

		clk_disable_unprepare(msp->clk);

	return ret;

}



static int mv643xx_eth_shared_remove(struct platform_device *pdev)