Merge branch 'clk-helpers' (early part) into clk-fixes

* 'clk-helpers' (early part): clk: fix determine rate error with pass-through clock
2018-03-12 15:10:54 -07:00 · 2018-03-12 15:10:54 -07:00 · 56e1ee3539
parent 91584eb51b 04bf9ab335
commit 56e1ee3539
1 changed files with 3 additions and 1 deletions
--- 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);