From 3759a9dd516b55382d4dba2d4a6c8a09020fcf33 Mon Sep 17 00:00:00 2001 From: kfx Date: Wed, 6 Jun 2012 18:59:15 +0800 Subject: [PATCH] rk30: i2c: fix warning about clk_disable --- drivers/i2c/busses/i2c-rk29-adapter.c | 3 +++ drivers/i2c/busses/i2c-rk30-adapter.c | 1 - drivers/i2c/busses/i2c-rk30.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-rk29-adapter.c b/drivers/i2c/busses/i2c-rk29-adapter.c index edae8e907693..726c8241d805 100755 --- a/drivers/i2c/busses/i2c-rk29-adapter.c +++ b/drivers/i2c/busses/i2c-rk29-adapter.c @@ -536,6 +536,8 @@ static int rk29_i2c_xfer(struct i2c_adapter *adap, int ret = 0; unsigned long scl_rate; + clk_enable(i2c->clk); + if(msgs[0].scl_rate <= 400000 && msgs[0].scl_rate >= 10000) scl_rate = msgs[0].scl_rate; else if(msgs[0].scl_rate > 400000){ @@ -560,6 +562,7 @@ static int rk29_i2c_xfer(struct i2c_adapter *adap, rk29_i2c_disable_mport(i2c); if(i2c->is_div_from_arm[i2c->adap.nr]) wake_unlock(&i2c->idlelock[i2c->adap.nr]); + clk_disable(i2c->clk); return ret; } diff --git a/drivers/i2c/busses/i2c-rk30-adapter.c b/drivers/i2c/busses/i2c-rk30-adapter.c index f7b700b40d6a..d3374fd6f0bb 100755 --- a/drivers/i2c/busses/i2c-rk30-adapter.c +++ b/drivers/i2c/busses/i2c-rk30-adapter.c @@ -187,7 +187,6 @@ static void rk30_i2c_init_hw(struct rk30_i2c *i2c, unsigned long scl_rate) { i2c->scl_rate = 0; rk30_i2c_set_clk(i2c, scl_rate); - clk_disable(i2c->clk); return; } /* returns TRUE if we this is the last byte in the current message */ diff --git a/drivers/i2c/busses/i2c-rk30.c b/drivers/i2c/busses/i2c-rk30.c index 24935c72740e..ccd3777bb91f 100755 --- a/drivers/i2c/busses/i2c-rk30.c +++ b/drivers/i2c/busses/i2c-rk30.c @@ -124,7 +124,7 @@ static int rk30_i2c_probe(struct platform_device *pdev) i2c_dbg(&pdev->dev, "clock source %p\n", i2c->clk); - clk_enable(i2c->clk); + //clk_enable(i2c->clk); /* map the registers */ -- 2.34.1