From: Geert Uytterhoeven Date: Mon, 24 Nov 2025 10:28:26 +0000 (+0000) Subject: can: rcar_canfd: Invert reset assert order X-Git-Tag: v6.19-rc1~170^2~49^2~2^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c13eaf39932fc79aa1ac245a9b97090fe23d5e;p=thirdparty%2Fkernel%2Flinux.git can: rcar_canfd: Invert reset assert order The two resets are asserted during cleanup in the same order as they were deasserted during probe. Invert the order to restore symmetry. Signed-off-by: Geert Uytterhoeven Reviewed-by: Vincent Mailhol Reviewed-by: Biju Das Signed-off-by: Biju Das Link: https://patch.msgid.link/20251124102837.106973-2-biju.das.jz@bp.renesas.com Signed-off-by: Marc Kleine-Budde --- diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index 49ab65274b51d..cbcc971cda9ae 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -2192,8 +2192,8 @@ fail_mode: fail_clk: clk_disable_unprepare(gpriv->clkp); fail_reset: - reset_control_assert(gpriv->rstc1); reset_control_assert(gpriv->rstc2); + reset_control_assert(gpriv->rstc1); fail_dev: return err; } @@ -2214,8 +2214,8 @@ static void rcar_canfd_remove(struct platform_device *pdev) /* Enter global sleep mode */ rcar_canfd_set_bit(gpriv->base, RCANFD_GCTR, RCANFD_GCTR_GSLPR); clk_disable_unprepare(gpriv->clkp); - reset_control_assert(gpriv->rstc1); reset_control_assert(gpriv->rstc2); + reset_control_assert(gpriv->rstc1); } static int __maybe_unused rcar_canfd_suspend(struct device *dev)