From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 11 Nov 2013 14:23:50 +0000 (+0800)
Subject: i2c: wmt: add missing clk_disable_unprepare() on error
X-Git-Tag: v3.12.3~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b13b578a4a0e7dce4f20f3ab79a00c78623f47c;p=thirdparty%2Fkernel%2Fstable.git

i2c: wmt: add missing clk_disable_unprepare() on error

commit 2dc9688a106886db7191d30f30ffd61fde827efd upstream.

Add the missing clk_disable_unprepare() before return
from wmt_i2c_reset_hardware() in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
index c65da3d913a03..4bf9507cd1a1e 100644
--- a/drivers/i2c/busses/i2c-wmt.c
+++ b/drivers/i2c/busses/i2c-wmt.c
@@ -349,6 +349,7 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)
 	err = clk_set_rate(i2c_dev->clk, 20000000);
 	if (err) {
 		dev_err(i2c_dev->dev, "failed to set clock = 20Mhz\n");
+		clk_disable_unprepare(i2c_dev->clk);
 		return err;
 	}