diff options
| author | Stephen Boyd | 2015-09-17 21:28:41 +0200 |
|---|---|---|
| committer | Stephen Boyd | 2015-09-17 21:28:41 +0200 |
| commit | ab5c342992cac7d1ddaf8a75a4dcab0d13718022 (patch) | |
| tree | 7943cb450fa1d1604ce65eea1139a158261ebf1b /drivers/clk/clk.c | |
| parent | clk: Remove unneeded semicolons (diff) | |
| parent | drivers: clk: st: Rename st_pll3200c32_407_c0_x into st_pll3200c32_cx_x (diff) | |
| download | kernel-qcow2-linux-ab5c342992cac7d1ddaf8a75a4dcab0d13718022.tar.gz kernel-qcow2-linux-ab5c342992cac7d1ddaf8a75a4dcab0d13718022.tar.xz kernel-qcow2-linux-ab5c342992cac7d1ddaf8a75a4dcab0d13718022.zip | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
drivers: clk: st: Rename st_pll3200c32_407_c0_x into st_pll3200c32_cx_x
clk: check for invalid parent index of orphans in __clk_init()
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a66a6d433b1f..b005f666e3a1 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2437,7 +2437,8 @@ static int __clk_init(struct device *dev, struct clk *clk_user) hlist_for_each_entry_safe(orphan, tmp2, &clk_orphan_list, child_node) { if (orphan->num_parents && orphan->ops->get_parent) { i = orphan->ops->get_parent(orphan->hw); - if (!strcmp(core->name, orphan->parent_names[i])) + if (i >= 0 && i < orphan->num_parents && + !strcmp(core->name, orphan->parent_names[i])) clk_core_reparent(orphan, core); continue; } |