clk: sunxi-ng: v3s: Fix incorrect number of hw_clks. (4ff40d14) · Commits · 戴 / test

The hws field of sun8i_v3s_hw_clks has only 74 members. However, the number specified by CLK_NUMBER is 77 (= CLK_I2S0 + 1). This leads to runtime segmentation fault that is not always reproducible. This patch fixes the problem by specifying correct clock number. Signed-off-by:

Yunhao Tian <18373444@buaa.edu.cn> [Maxime: Also remove the CLK_NUMBER definition] Signed-off-by:

Maxime Ripard <maxime@cerno.tech>

drivers/clk/sunxi-ng/ccu-sun8i-v3s.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -618,7 +618,7 @@ static struct clk_hw_onecell_data sun8i_v3s_hw_clks = {
		[CLK_MBUS] = &mbus_clk.common.hw,
		[CLK_MIPI_CSI] = &mipi_csi_clk.common.hw,
		},
		.num = CLK_NUMBER,
		.num = CLK_PLL_DDR1 + 1,
		};

		static struct clk_hw_onecell_data sun8i_v3_hw_clks = {
		@@ -700,7 +700,7 @@ static struct clk_hw_onecell_data sun8i_v3_hw_clks = {
		[CLK_MBUS] = &mbus_clk.common.hw,
		[CLK_MIPI_CSI] = &mipi_csi_clk.common.hw,
		},
		.num = CLK_NUMBER,
		.num = CLK_I2S0 + 1,
		};

		static struct ccu_reset_map sun8i_v3s_ccu_resets[] = {

drivers/clk/sunxi-ng/ccu-sun8i-v3s.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,4 @@

		#define CLK_PLL_DDR1 74

		#define CLK_NUMBER (CLK_I2S0 + 1)

		#endif /* _CCU_SUN8I_H3_H_ */

Admin message