@@ -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;
}
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(-)