diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-17 22:33:37 +0200 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-07-30 01:55:50 +0200 |
commit | 0e014e92ba93d905bcb39881dce2d38807b90c34 (patch) | |
tree | f5c83f5402a8c3f4002671b573dd77b041571226 /drivers/i2c | |
parent | kmemleak: Protect the seq start/next/stop sequence by rcu_read_lock() (diff) | |
download | linux-0e014e92ba93d905bcb39881dce2d38807b90c34.tar.xz linux-0e014e92ba93d905bcb39881dce2d38807b90c34.zip |
i2c-s3c2410: s3c24xx_i2c_init: don't clobber IICLC value
s3c24xx_i2c_init() was overwriting the IICLC value set just above in
s3c24xx_i2c_clockrate() with zero, effectively disabling the platform
line control setting.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 8f42a4536cdf..20bb0ceb027b 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -763,11 +763,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c) dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq); dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon); - /* check for s3c2440 i2c controller */ - - if (s3c24xx_i2c_is2440(i2c)) - writel(0x0, i2c->regs + S3C2440_IICLC); - return 0; } |