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

Commit c26dcd1c authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

can: rcar_can: fix suspend/resume 

commit f7c05c3987dcfde9a4e8c2d533db013fabebca0d upstream.

If the driver was not opened, rcar_can_suspend() should not call
clk_disable() because the clock was not enabled.

Fixes: fd115931 ("can: add Renesas R-Car CAN driver")
Link: https://lore.kernel.org/all/20210924075556.223685-1-yoshihiro.shimoda.uh@renesas.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarAyumi Nakamichi <ayumi.nakamichi.kf@renesas.com>
Reviewed-by: default avatarUlrich Hecht <uli+renesas@fpond.eu>
Tested-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c5585ea

drivers/net/can/rcar/rcar_can.c

+12 −8
Original line number Diff line number Diff line
@@ -848,10 +848,12 @@ static int __maybe_unused rcar_can_suspend(struct device *dev) 
	struct rcar_can_priv *priv = netdev_priv(ndev);

	u16 ctlr;



	if (netif_running(ndev)) {

	if (!netif_running(ndev))

		return 0;



	netif_stop_queue(ndev);

	netif_device_detach(ndev);

	}



	ctlr = readw(&priv->regs->ctlr);

	ctlr |= RCAR_CAN_CTLR_CANM_HALT;

	writew(ctlr, &priv->regs->ctlr);
@@ -870,6 +872,9 @@ static int __maybe_unused rcar_can_resume(struct device *dev) 
	u16 ctlr;

	int err;



	if (!netif_running(ndev))

		return 0;



	err = clk_enable(priv->clk);

	if (err) {

		netdev_err(ndev, "clk_enable() failed, error %d\n", err);
@@ -883,10 +888,9 @@ static int __maybe_unused rcar_can_resume(struct device *dev) 
	writew(ctlr, &priv->regs->ctlr);

	priv->can.state = CAN_STATE_ERROR_ACTIVE;



	if (netif_running(ndev)) {

	netif_device_attach(ndev);

	netif_start_queue(ndev);

	}



	return 0;

}