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

Commit befa6011 authored by Yegor Yefremov's avatar Yegor Yefremov Committed by Marc Kleine-Budde
Browse files

can: ti_hecc: add missing prepare and unprepare of the clock 



In order to make the driver work with the common clock framework, this
patch converts the clk_enable()/clk_disable() to
clk_prepare_enable()/clk_disable_unprepare().

Also add error checking for clk_prepare_enable().

Signed-off-by: default avatarYegor Yefremov <yegorslists@googlemail.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent c97c52be

drivers/net/can/ti_hecc.c

+12 −4
Original line number Diff line number Diff line
@@ -948,7 +948,12 @@ static int ti_hecc_probe(struct platform_device *pdev) 
	netif_napi_add(ndev, &priv->napi, ti_hecc_rx_poll,

		HECC_DEF_NAPI_WEIGHT);



	clk_enable(priv->clk);

	err = clk_prepare_enable(priv->clk);

	if (err) {

		dev_err(&pdev->dev, "clk_prepare_enable() failed\n");

		goto probe_exit_clk;

	}



	err = register_candev(ndev);

	if (err) {

		dev_err(&pdev->dev, "register_candev() failed\n");
@@ -981,7 +986,7 @@ static int ti_hecc_remove(struct platform_device *pdev) 
	struct ti_hecc_priv *priv = netdev_priv(ndev);



	unregister_candev(ndev);

	clk_disable(priv->clk);

	clk_disable_unprepare(priv->clk);

	clk_put(priv->clk);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	iounmap(priv->base);
@@ -1006,7 +1011,7 @@ static int ti_hecc_suspend(struct platform_device *pdev, pm_message_t state) 
	hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_PDR);

	priv->can.state = CAN_STATE_SLEEPING;



	clk_disable(priv->clk);

	clk_disable_unprepare(priv->clk);



	return 0;

}
@@ -1015,8 +1020,11 @@ static int ti_hecc_resume(struct platform_device *pdev) 
{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct ti_hecc_priv *priv = netdev_priv(dev);

	int err;



	clk_enable(priv->clk);

	err = clk_prepare_enable(priv->clk);

	if (err)

		return err;



	hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_PDR);

	priv->can.state = CAN_STATE_ERROR_ACTIVE;