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

* 'clk-helpers' (early part): clk: fix determine rate error with pass-through clock

Merge branch 'clk-helpers' (early part) into clk-fixes
* 'clk-helpers' (early part): clk: fix determine rate error with pass-through clock
56e1ee35 · Stephen Boyd · 91584eb5 · 04bf9ab3 · 56e1ee35
Commit 56e1ee35 authored Mar 12, 2018 by Stephen Boyd
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

drivers/clk/clk.c drivers/clk/clk.c +3 -1

No files found.
--- 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);