Commit 1f6f1dcb authored Jul 27, 2017 by Jerome Brunet Committed by Neil Armstrong Aug 04, 2017

clk: meson: gxbb: fix protection against undefined clks



gxbb clock driver gracefully handles case where the clkid is defined but
the clock hw pointer is not provided, as long as it is not at the end of
the hw_onecell_data array.

This patch ensure that the last entries are defined as well to handle
this particular case.

Fixes: a70c6e06 ("clk: meson: gxbb: protect against holes in the onecell_data array")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

parent de2bc417

drivers/clk/meson/gxbb.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1183,6 +1183,7 @@ static struct clk_hw_onecell_data gxbb_hw_onecell_data = {
		[CLKID_32K_CLK] = &gxbb_32k_clk.hw,
		[CLKID_32K_CLK_SEL] = &gxbb_32k_clk_sel.hw,
		[CLKID_32K_CLK_DIV] = &gxbb_32k_clk_div.hw,
		[NR_CLKS] = NULL,
		},
		.num = NR_CLKS,
		};
		@@ -1305,6 +1306,7 @@ static struct clk_hw_onecell_data gxl_hw_onecell_data = {
		[CLKID_32K_CLK] = &gxbb_32k_clk.hw,
		[CLKID_32K_CLK_SEL] = &gxbb_32k_clk_sel.hw,
		[CLKID_32K_CLK_DIV] = &gxbb_32k_clk_div.hw,
		[NR_CLKS] = NULL,
		},
		.num = NR_CLKS,
		};

Admin message