From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-kernel@vger.kernel.org>, <linux-i2c@vger.kernel.org>
Cc: <wsa@kernel.org>, <f.fainelli@gmail.com>
Subject: [PATCH -next] i2c: bcm2835: add missing disable and put clk on error in bcm2835_i2c_probe()
Date: Tue, 1 Jun 2021 22:08:35 +0800 [thread overview]
Message-ID: <20210601140835.3595921-1-yangyingliang@huawei.com> (raw)
Add clk_disable_unprepare() and clk_rate_exclusive_put() on error
path in bcm2835_i2c_probe().
Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/i2c/busses/i2c-bcm2835.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 37443edbf754..a7fa3429c389 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -449,13 +449,14 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
ret = clk_prepare_enable(i2c_dev->bus_clk);
if (ret) {
dev_err(&pdev->dev, "Couldn't prepare clock");
- return ret;
+ goto err_put_clk;
}
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!irq) {
dev_err(&pdev->dev, "No IRQ resource\n");
- return -ENODEV;
+ ret = -ENODEV;
+ goto err_disable_clk;
}
i2c_dev->irq = irq->start;
@@ -463,7 +464,8 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
dev_name(&pdev->dev), i2c_dev);
if (ret) {
dev_err(&pdev->dev, "Could not request IRQ\n");
- return -ENODEV;
+ ret = -ENODEV;
+ goto err_disable_clk;
}
adap = &i2c_dev->adapter;
@@ -480,9 +482,17 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, 0);
ret = i2c_add_adapter(adap);
- if (ret)
+ if (ret) {
free_irq(i2c_dev->irq, i2c_dev);
+ goto err_disable_clk;
+ }
+ return 0;
+
+err_disable_clk:
+ clk_disable_unprepare(i2c_dev->bus_clk);
+err_put_clk:
+ clk_rate_exclusive_put(i2c_dev->bus_clk);
return ret;
}
--
2.25.1
next reply other threads:[~2021-06-01 14:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 14:08 Yang Yingliang [this message]
2022-02-07 14:49 ` [PATCH -next] i2c: bcm2835: add missing disable and put clk on error in bcm2835_i2c_probe() Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210601140835.3595921-1-yangyingliang@huawei.com \
--to=yangyingliang@huawei.com \
--cc=f.fainelli@gmail.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).