---

yaml --- r: 211201 b: refs/heads/master c: 7031307 h: refs/heads/master i: 211199: c08a8cb v: v3
git-mirror · Sep 30, 2010 · 6e3f264 · 6e3f264
1 parent e3ca3cc
commit 6e3f264
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;