diff options
| author | Georgi Djakov <djakov@kernel.org> | 2023-10-10 14:11:07 +0300 |
|---|---|---|
| committer | Georgi Djakov <djakov@kernel.org> | 2023-10-10 14:11:07 +0300 |
| commit | 9330bf741fdac78c398a866f979fd29fea435a88 (patch) | |
| tree | b622ed8abd1a6a19b47b33026bea97869ceaf499 /drivers/interconnect/qcom/icc-rpm.c | |
| parent | bd35cbd7212200c1b1ed38d5fb5b43a8c9692153 (diff) | |
| parent | 4d8784d84e17529f0f0774d3a946fd07057cd9a4 (diff) | |
| download | linux-9330bf741fdac78c398a866f979fd29fea435a88.tar.xz | |
Merge branch 'icc-misc' into icc-next
* icc-misc
interconnect: imx: Replace custom implementation of COUNT_ARGS()
interconnect: msm8974: Replace custom implementation of COUNT_ARGS()
interconnect: qcom: osm-l3: Replace custom implementation of COUNT_ARGS()
interconnect: fix error handling in qnoc_probe()
interconnect: imx: Replace inclusion of kernel.h in the header
dt-bindings: interconnect: qcom,rpmh: do not require reg on SDX65 MC virt
Signed-off-by: Georgi Djakov <djakov@kernel.org>
Diffstat (limited to 'drivers/interconnect/qcom/icc-rpm.c')
| -rw-r--r-- | drivers/interconnect/qcom/icc-rpm.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index 9c40314e03b5..628e651c555c 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -543,7 +543,7 @@ regmap_done: ret = devm_clk_bulk_get(dev, qp->num_intf_clks, qp->intf_clks); if (ret) - return ret; + goto err_disable_unprepare_clk; provider = &qp->provider; provider->dev = dev; @@ -558,7 +558,7 @@ regmap_done: /* If this fails, bus accesses will crash the platform! */ ret = clk_bulk_prepare_enable(qp->num_intf_clks, qp->intf_clks); if (ret) - return ret; + goto err_disable_unprepare_clk; for (i = 0; i < num_nodes; i++) { size_t j; @@ -571,6 +571,8 @@ regmap_done: node = icc_node_create(qnodes[i]->id); if (IS_ERR(node)) { + clk_bulk_disable_unprepare(qp->num_intf_clks, + qp->intf_clks); ret = PTR_ERR(node); goto err_remove_nodes; } @@ -586,8 +588,11 @@ regmap_done: if (qnodes[i]->qos.ap_owned && qnodes[i]->qos.qos_mode != NOC_QOS_MODE_INVALID) { ret = qcom_icc_qos_set(node); - if (ret) - return ret; + if (ret) { + clk_bulk_disable_unprepare(qp->num_intf_clks, + qp->intf_clks); + goto err_remove_nodes; + } } data->nodes[i] = node; @@ -615,6 +620,7 @@ err_deregister_provider: icc_provider_deregister(provider); err_remove_nodes: icc_nodes_remove(provider); +err_disable_unprepare_clk: clk_disable_unprepare(qp->bus_clk); return ret; |