Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1280661

[PATCH] clk: qcom: common: check for failure

Show all headers | View raw

We were not checking the return from devm_add_action() which can fail.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/clk/qcom/common.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index c112eba..3541a9a 100644
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -213,7 +213,10 @@ int qcom_cc_really_probe(struct platform_device *pdev,
 	if (ret)
 		return ret;
 
-	devm_add_action(dev, qcom_cc_del_clk_provider, pdev->dev.of_node);
+	ret = devm_add_action(dev, qcom_cc_del_clk_provider,
+			      pdev->dev.of_node);
+	if (ret)
+		return ret;
 
 	reset = &cc->reset;
 	reset->rcdev.of_node = dev->of_node;
@@ -236,8 +239,12 @@ int qcom_cc_really_probe(struct platform_device *pdev,
 			return ret;
 	}
 
-	devm_add_action(dev, qcom_cc_gdsc_unregister, dev);
-
+	ret = devm_add_action(dev, qcom_cc_gdsc_unregister, dev);
+	if (ret) {
+		if (desc->gdscs && desc->num_gdscs)
+			gdsc_unregister(dev);
+		return ret;
+	}
 
 	return 0;
 }
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] clk: qcom: common: check for failure Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-12-01 10:10 +0100
  Re: [PATCH] clk: qcom: common: check for failure Stephen Boyd <sboyd@codeaurora.org> - 2015-12-03 08:40 +0100
    Re: [PATCH] clk: qcom: common: check for failure Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-12-03 10:00 +0100

csiph-web