Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[cascardo/linux.git] / drivers / clk / tegra / clk.c

diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c
index f87c609..97dc859 100644 (file)
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c
@@ -207,8 +207,13 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl,
 
        for (; tbl->clk_id < clk_max; tbl++) {
                clk = clks[tbl->clk_id];
-               if (IS_ERR_OR_NULL(clk))
-                       return;
+               if (IS_ERR_OR_NULL(clk)) {
+                       pr_err("%s: invalid entry %ld in clks array for id %d\n",
+                              __func__, PTR_ERR(clk), tbl->clk_id);
+                       WARN_ON(1);
+
+                       continue;
+               }
 
                if (tbl->parent_id < clk_max) {
                        struct clk *parent = clks[tbl->parent_id];