summaryrefslogtreecommitdiffstats
path: root/drivers/firmware/qcom_scm.c
diff options
context:
space:
mode:
authorWei Yongjun2016-08-28 18:29:10 +0200
committerAndy Gross2016-11-13 06:24:51 +0100
commitbd4760ca03156731674a570e44490986189d8228 (patch)
tree9d7d1f3e52dc87e37b78f0d043f9aa8ba9423006 /drivers/firmware/qcom_scm.c
parentMAINTAINERS: add drivers/pinctrl/qcom to ARM/QUALCOMM SUPPORT (diff)
downloadkernel-qcow2-linux-bd4760ca03156731674a570e44490986189d8228.tar.gz
kernel-qcow2-linux-bd4760ca03156731674a570e44490986189d8228.tar.xz
kernel-qcow2-linux-bd4760ca03156731674a570e44490986189d8228.zip
firmware: qcom: scm: Use devm_reset_controller_register()
Use devm_reset_controller_register() for the reset controller registration and fixes the memory leak when unload the module. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Andy Gross <andy.gross@linaro.org>
Diffstat (limited to 'drivers/firmware/qcom_scm.c')
-rw-r--r--drivers/firmware/qcom_scm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index d95c70227c05..9bf66aefdbd0 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -356,7 +356,9 @@ static int qcom_scm_probe(struct platform_device *pdev)
scm->reset.ops = &qcom_scm_pas_reset_ops;
scm->reset.nr_resets = 1;
scm->reset.of_node = pdev->dev.of_node;
- reset_controller_register(&scm->reset);
+ ret = devm_reset_controller_register(&pdev->dev, &scm->reset);
+ if (ret)
+ return ret;
/* vote for max clk rate for highest performance */
ret = clk_set_rate(scm->core_clk, INT_MAX);