diff options
| -rw-r--r-- | drivers/clk/clk.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index f467d63bbf1e..add86a4b8e8c 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -424,19 +424,20 @@ static void clk_core_fill_parent_index(struct clk_core *core, u8 index) if (entry->hw) { parent = entry->hw->core; - /* - * We have a direct reference but it isn't registered yet? - * Orphan it and let clk_reparent() update the orphan status - * when the parent is registered. - */ - if (!parent) - parent = ERR_PTR(-EPROBE_DEFER); } else { parent = clk_core_get(core, index); if (PTR_ERR(parent) == -ENOENT && entry->name) parent = clk_core_lookup(entry->name); } + /* + * We have a direct reference but it isn't registered yet? + * Orphan it and let clk_reparent() update the orphan status + * when the parent is registered. + */ + if (!parent) + parent = ERR_PTR(-EPROBE_DEFER); + /* Only cache it if it's not an error */ if (!IS_ERR(parent)) entry->core = parent; |