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

Groups > linux.kernel > #1655901

[PATCH v2] misc: atmel-ssc: Handle return value of clk_prepare_enable and clk_prepare

Show all headers | View raw

clk_prepare_enable() and clk_prepare() can fail here and
we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 drivers/misc/atmel-ssc.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index b2a0340..df34b81 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -30,6 +30,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
 {
 	int ssc_valid = 0;
 	struct ssc_device *ssc;
+	int ret;
 
 	spin_lock(&user_lock);
 	list_for_each_entry(ssc, &ssc_list, list) {
@@ -60,7 +61,11 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
 	ssc->user++;
 	spin_unlock(&user_lock);
 
-	clk_prepare(ssc->clk);
+	ret = clk_prepare(ssc->clk);
+	if (ret) {
+		pr_err("Failed to prepare clock\n");
+		return ERR_PTR(ret);
+	}
 
 	return ssc;
 }
@@ -195,6 +200,7 @@ static int ssc_probe(struct platform_device *pdev)
 	struct resource *regs;
 	struct ssc_device *ssc;
 	const struct atmel_ssc_platform_data *plat_dat;
+	int ret;
 
 	ssc = devm_kzalloc(&pdev->dev, sizeof(struct ssc_device), GFP_KERNEL);
 	if (!ssc) {
@@ -229,7 +235,9 @@ static int ssc_probe(struct platform_device *pdev)
 	}
 
 	/* disable all interrupts */
-	clk_prepare_enable(ssc->clk);
+	ret = clk_prepare_enable(ssc->clk);
+	if (ret)
+		return ret;
 	ssc_writel(ssc->regs, IDR, -1);
 	ssc_readl(ssc->regs, SR);
 	clk_disable_unprepare(ssc->clk);
-- 
1.9.1

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

Thread

[PATCH v2] misc: atmel-ssc: Handle return value of clk_prepare_enable and clk_prepare Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-06-02 07:40 +0200
  Re: [PATCH v2] misc: atmel-ssc: Handle return value of  clk_prepare_enable and clk_prepare Greg KH <gregkh@linuxfoundation.org> - 2017-06-03 16:20 +0200
  Re: [PATCH v2] misc: atmel-ssc: Handle return value of  clk_prepare_enable and clk_prepare Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-06-04 00:20 +0200
    Re: [PATCH v2] misc: atmel-ssc: Handle return value of  clk_prepare_enable and clk_prepare Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-06-05 11:30 +0200
      Re: [PATCH v2] misc: atmel-ssc: Handle return value of  clk_prepare_enable and clk_prepare Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-06-05 11:40 +0200
        Re: [PATCH v2] misc: atmel-ssc: Handle return value of  clk_prepare_enable and clk_prepare Greg KH <gregkh@linuxfoundation.org> - 2017-06-05 14:10 +0200
          Re: [PATCH v2] misc: atmel-ssc: Handle return value of  clk_prepare_enable and clk_prepare Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-06-05 15:20 +0200

csiph-web