[PATCH 1/3] i2c: s3c2410: Add missing clock unprepare on probe() error path

From	Krzysztof Kozlowski <k.kozlowski@samsung.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/3] i2c: s3c2410: Add missing clock unprepare on probe() error path
Date	2016-04-20 11:30 +0200
Message-ID	<rpWCm-5DB-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

If during probe() the s3c24xx_i2c_init() failed, the clock was left in
disabled but prepared state.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/i2c/busses/i2c-s3c2410.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 362a6de54833..e9658af36f2e 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1200,6 +1200,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 	clk_disable(i2c->clk);
 	if (ret != 0) {
 		dev_err(&pdev->dev, "I2C controller init failed\n");
+		clk_unprepare(i2c->clk);
 		return ret;
 	}
 	/* find the IRQ for this unit (note, this relies on the init call to
-- 
1.9.1

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

Thread

[PATCH 1/3] i2c: s3c2410: Add missing clock unprepare on probe() error  path Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-04-20 11:30 +0200
  [PATCH 3/3] i2c: s3c2410: Cleanup indentation and comment style Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-04-20 11:30 +0200
    Re: [PATCH 3/3] i2c: s3c2410: Cleanup indentation and comment style Javier Martinez Canillas <javier@osg.samsung.com> - 2016-04-20 16:10 +0200
  [PATCH 2/3] i2c: s3c2410: Minor function-level comment cleanup Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-04-20 11:30 +0200
    Re: [PATCH 2/3] i2c: s3c2410: Minor function-level comment cleanup Javier Martinez Canillas <javier@osg.samsung.com> - 2016-04-20 16:10 +0200
      Re: [PATCH 2/3] i2c: s3c2410: Minor function-level comment cleanup Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-04-21 09:10 +0200
  Re: [PATCH 1/3] i2c: s3c2410: Add missing clock unprepare on probe()  error path Javier Martinez Canillas <javier@osg.samsung.com> - 2016-04-20 15:50 +0200

csiph-web