diff options
| author | Alex Elder <alex.elder@linaro.org> | 2013-09-05 08:33:24 -0500 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-09-09 14:10:10 -0700 |
| commit | 12d298865ec5d0f14dd570c3506c270880769ed7 (patch) | |
| tree | 2bd42e97f917dc9f9122e6f672d26edce472d022 /drivers/clk/clk.c | |
| parent | 22e9e7589e7bc6006af983f73e4a4057dbd9da66 (diff) | |
| download | blackbird-op-linux-12d298865ec5d0f14dd570c3506c270880769ed7.tar.gz blackbird-op-linux-12d298865ec5d0f14dd570c3506c270880769ed7.zip | |
clk: only call get_parent if there is one
In __clk_init(), after a clock is mostly initialized, a scan is done
of the orphan clocks to see if the clock being registered is the
parent of any of them.
This code assumes that any clock that provides a get_parent method
actually has at least one parent, and that's not a valid assumption.
As a result, an orphan clock with no parent can return *something*
as the parent index, and that value is blindly used to dereference
the orphan's parent_names[] array (which will be ZERO_SIZE_PTR or
NULL).
Fix this by ensuring get_parent is only called for orphans with at
least one parent.
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index cc4cb6fd7d83..a004769528e6 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1742,7 +1742,7 @@ int __clk_init(struct device *dev, struct clk *clk) * this clock */ hlist_for_each_entry_safe(orphan, tmp2, &clk_orphan_list, child_node) { - if (orphan->ops->get_parent) { + if (orphan->num_parents && orphan->ops->get_parent) { i = orphan->ops->get_parent(orphan->hw); if (!strcmp(clk->name, orphan->parent_names[i])) __clk_reparent(orphan, clk); |
