diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-20 16:10:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-20 16:10:35 -0700 |
| commit | 1d7b0bcc5f6de8423298f83dbcba2c6764ca4f04 (patch) | |
| tree | b9bbac2800f584b97f8be2741db966a7178b6208 | |
| parent | ccee2cb02c68199cbbcd0a8319f065472a886f82 (diff) | |
| parent | 520bcb4b2a8731571aa78cca18cc1e8560564e37 (diff) | |
Merge "clk: msm: clock-local2: Fix get_rate ops for branch clock"
| -rw-r--r-- | drivers/clk/msm/clock-local2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/msm/clock-local2.c b/drivers/clk/msm/clock-local2.c index 19956f030ae9..adb07cdb7e8d 100644 --- a/drivers/clk/msm/clock-local2.c +++ b/drivers/clk/msm/clock-local2.c @@ -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); |