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: fd1159318e55 ("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: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: Ayumi Nakamichi <ayumi.nakamichi.kf@renesas.com>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
Tested-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index 9b2c3bd00f8b4c8daa2bd3327cd1b64a11317ba4..2ac33ee1067eb0eb43072629401840bdfa70b522 100644 (file)
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -858,10 +858,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)) {
-               netif_stop_queue(ndev);
-               netif_device_detach(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);
@@ -880,6 +882,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);
@@ -893,10 +898,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);
-       }
+       netif_device_attach(ndev);
+       netif_start_queue(ndev);
+
        return 0;
 }