From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/drivers/clk/renesas/renesas-cpg-mssr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/drivers/clk/renesas/renesas-cpg-mssr.c b/kernel/drivers/clk/renesas/renesas-cpg-mssr.c index 94db883..a5a68e1 100644 --- a/kernel/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/kernel/drivers/clk/renesas/renesas-cpg-mssr.c @@ -914,9 +914,8 @@ } if (!i) - dev_warn(dev, "Failed to enable %s%u[0x%x]\n", - priv->reg_layout == CLK_REG_LAYOUT_RZ_A ? - "STB" : "SMSTP", reg, oldval & mask); + dev_warn(dev, "Failed to enable SMSTP%u[0x%x]\n", reg, + oldval & mask); } return 0; @@ -960,7 +959,6 @@ goto out_err; } - cpg_mssr_priv = priv; priv->num_core_clks = info->num_total_core_clks; priv->num_mod_clks = info->num_hw_mod_clks; priv->last_dt_core_clk = info->last_dt_core_clk; @@ -990,6 +988,8 @@ if (error) goto out_err; + cpg_mssr_priv = priv; + return 0; out_err: -- Gitblit v1.6.2