Merge branches 'clk-qcom-rpmh', 'clk-qcom-spdx', 'clk-con-id-leak', 'clk-fixed-factor-populated' and 'clk-mvebu-periph-parent' into clk-next
* clk-qcom-rpmh: : - Qualcomm RPMh clk driver clk: qcom: clk-rpmh: Add QCOM RPMh clock driver * clk-qcom-spdx: : - SPDX tagging for qcom clk: qcom: Update SPDX headers for common files * clk-con-id-leak: : - Stop leaking con ids in __clk_put() clk: core: Potentially free connection id * clk-fixed-factor-populated: : - Fix a corner case in fixed factor clk probing where node is in DT but : parent clk is registered much later clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure * clk-mvebu-periph-parent: : - Marvell Armada 3700 clk_pm_cpu_get_parent() had an invalid return value clk: mvebu: armada-37xx-periph: Remove unused var num_parents clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent
这个提交包含在:

@@ -3133,6 +3133,7 @@ struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
|
||||
return clk;
|
||||
}
|
||||
|
||||
/* keep in sync with __clk_put */
|
||||
void __clk_free_clk(struct clk *clk)
|
||||
{
|
||||
clk_prepare_lock();
|
||||
@@ -3512,6 +3513,7 @@ int __clk_get(struct clk *clk)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* keep in sync with __clk_free_clk */
|
||||
void __clk_put(struct clk *clk)
|
||||
{
|
||||
struct module *owner;
|
||||
@@ -3545,6 +3547,7 @@ void __clk_put(struct clk *clk)
|
||||
|
||||
module_put(owner);
|
||||
|
||||
kfree_const(clk->con_id);
|
||||
kfree(clk);
|
||||
}
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户