OSDN Git Service

clk: meson: meson8b: fix protection against undefined clks
authorJerome Brunet <jbrunet@baylibre.com>
Thu, 27 Jul 2017 16:17:54 +0000 (18:17 +0200)
committerNeil Armstrong <narmstrong@baylibre.com>
Fri, 4 Aug 2017 15:49:31 +0000 (17:49 +0200)
meson8b 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: e92f7cca446e ("clk: meson8b: clean up fixed rate clocks")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
drivers/clk/meson/meson8b.c

index bb3f1de..7629aa0 100644 (file)
@@ -585,6 +585,7 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = {
                [CLKID_MPLL0]               = &meson8b_mpll0.hw,
                [CLKID_MPLL1]               = &meson8b_mpll1.hw,
                [CLKID_MPLL2]               = &meson8b_mpll2.hw,
+               [CLK_NR_CLKS]               = NULL,
        },
        .num = CLK_NR_CLKS,
 };