diff options
author | Jerome Brunet <jbrunet@baylibre.com> | 2017-07-27 18:17:55 +0200 |
---|---|---|
committer | Neil Armstrong <narmstrong@baylibre.com> | 2017-08-04 17:49:32 +0200 |
commit | 1f6f1dcb8d1c3340f73c5ba01d474fa07942ec2b (patch) | |
tree | 412bbc439a87ae4565ee119b3035a5189ba022f7 /drivers/clk/meson | |
parent | de2bc4178b8d475fb0bc06c280606fdf816a3f6c (diff) | |
download | op-kernel-dev-1f6f1dcb8d1c3340f73c5ba01d474fa07942ec2b.zip op-kernel-dev-1f6f1dcb8d1c3340f73c5ba01d474fa07942ec2b.tar.gz |
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: a70c6e06ed7c ("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>
Diffstat (limited to 'drivers/clk/meson')
-rw-r--r-- | drivers/clk/meson/gxbb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index a897ea4..8409d86 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -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, }; |