From 6e3f2649af0d63dbf46366d8aef0670809695a88 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Thu, 30 Sep 2010 15:54:46 +0200 Subject: [PATCH] --- yaml --- r: 211201 b: refs/heads/master c: 7031307aefb6048377385dbb0af2dd43bb0190bb h: refs/heads/master i: 211199: c08a8cbfbee65c8454b884ebb433b589c69f0f30 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 865e5dcac87e..245a35c1c7fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bba0fd8d1c6d405df666e2573e1a1f917098be0 +refs/heads/master: 7031307aefb6048377385dbb0af2dd43bb0190bb diff --git a/trunk/drivers/i2c/busses/i2c-s3c2410.c b/trunk/drivers/i2c/busses/i2c-s3c2410.c index 72902e0bbfa7..bf831bf81587 100644 --- a/trunk/drivers/i2c/busses/i2c-s3c2410.c +++ b/trunk/drivers/i2c/busses/i2c-s3c2410.c @@ -662,8 +662,8 @@ static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got) unsigned long sda_delay; if (pdata->sda_delay) { - sda_delay = (freq / 1000) * pdata->sda_delay; - sda_delay /= 1000000; + sda_delay = clkin * pdata->sda_delay; + sda_delay = DIV_ROUND_UP(sda_delay, 1000000); sda_delay = DIV_ROUND_UP(sda_delay, 5); if (sda_delay > 3) sda_delay = 3;