evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "clk: msm: clock-local2: Fix get_rate ops for branch clock"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-20 16:10:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1d7b0bcc5f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/clk/msm/clock-local2.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -928,7 +928,8 @@ static unsigned long branch_clk_get_rate(struct clk *c)
{
struct branch_clk *branch = to_branch_clk(c);
if (branch->max_div)
if (branch->max_div ||
(branch->aggr_sibling_rates && !branch->is_prepared))
return branch->c.rate;
return clk_get_rate(c->parent);