diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2018-10-02 10:26:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 10:26:02 -0300 |
| commit | 5f3fecbc0715a70437501e1d85e74726c4f561be (patch) | |
| tree | f10a85be5659f9b2f8f3ca4aff41d8fd3aa01b37 /drivers/clk/clk-fixed-factor.c | |
| parent | ded0ac8f40f9561d8ab2f8ef6c9ff8dc435f2b41 (diff) | |
| parent | c98b0c5db65001d10d7f0af026801b9c193c369e (diff) | |
Merge pull request #38 from gibsson/4.9-2.3.x-imx
Merge v4.9.130 into 4.9-2.3.x imx
Diffstat (limited to 'drivers/clk/clk-fixed-factor.c')
| -rw-r--r-- | drivers/clk/clk-fixed-factor.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index a5d402de5584..20724abd38bd 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -177,8 +177,15 @@ static struct clk *_of_fixed_factor_clk_setup(struct device_node *node) clk = clk_register_fixed_factor(NULL, clk_name, parent_name, flags, mult, div); - if (IS_ERR(clk)) + if (IS_ERR(clk)) { + /* + * If parent clock is not registered, registration would fail. + * Clear OF_POPULATED flag so that clock registration can be + * attempted again from probe function. + */ + of_node_clear_flag(node, OF_POPULATED); return clk; + } ret = of_clk_add_provider(node, of_clk_src_simple_get, clk); if (ret) { |