diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-03-12 15:10:54 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-03-12 15:10:54 -0700 |
| commit | 56e1ee3539437a26ebec358167d1f8cd07253c3d (patch) | |
| tree | 08afd3dd655349c57e44a2fff992226d2212a2ac /drivers/clk | |
| parent | 91584eb51b47213ca7e031f588e8a4da49f65ef6 (diff) | |
| parent | 04bf9ab3359ff89059509ee5c35446c45b9cdaaa (diff) | |
| download | linux-stable-56e1ee3539437a26ebec358167d1f8cd07253c3d.tar.gz linux-stable-56e1ee3539437a26ebec358167d1f8cd07253c3d.tar.bz2 linux-stable-56e1ee3539437a26ebec358167d1f8cd07253c3d.zip | |
Merge branch 'clk-helpers' (early part) into clk-fixes
* 'clk-helpers' (early part):
clk: fix determine rate error with pass-through clock
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 337189971d34..076d4244d672 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1125,8 +1125,10 @@ static int clk_core_round_rate_nolock(struct clk_core *core, { lockdep_assert_held(&prepare_lock); - if (!core) + if (!core) { + req->rate = 0; return 0; + } clk_core_init_rate_req(core, req); |