Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
clk
/
qcom
/
clk-branch.c
diff --git
a/kernel/drivers/clk/qcom/clk-branch.c
b/kernel/drivers/clk/qcom/clk-branch.c
index
6b4d2bc
..
26f7af3
100644
(file)
--- a/
kernel/drivers/clk/qcom/clk-branch.c
+++ b/
kernel/drivers/clk/qcom/clk-branch.c
@@
-75,7
+75,7
@@
static int clk_branch_wait(const struct clk_branch *br, bool enabling,
bool (check_halt)(const struct clk_branch *, bool))
{
bool voted = br->halt_check & BRANCH_VOTED;
bool (check_halt)(const struct clk_branch *, bool))
{
bool voted = br->halt_check & BRANCH_VOTED;
- const char *name =
__clk_get_name(br->clkr.hw.clk
);
+ const char *name =
clk_hw_get_name(&br->clkr.hw
);
/* Skip checking halt bit if the clock is in hardware gated mode */
if (clk_branch_in_hwcg_mode(br))
/* Skip checking halt bit if the clock is in hardware gated mode */
if (clk_branch_in_hwcg_mode(br))