lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2637/i2c/samsung' into next-i2c

Browse Source
This commit is contained in:
Ben Dooks
2010-10-28 10:07:14 +01:00
parent 3751638549 d2360b8e84
commit e0b11c3c38
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/i2c/busses/i2c-s3c2410.c
View File

@@ -554,18 +554,23 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,
int retry; int retry;
int ret; int ret;
clk_enable(i2c->clk);
for (retry = 0; retry < adap->retries; retry++) { for (retry = 0; retry < adap->retries; retry++) {
ret = s3c24xx_i2c_doxfer(i2c, msgs, num); ret = s3c24xx_i2c_doxfer(i2c, msgs, num);
if (ret != -EAGAIN) if (ret != -EAGAIN) {
clk_disable(i2c->clk);
return ret; return ret;
}
dev_dbg(i2c->dev, "Retrying transmission (%d)\n", retry); dev_dbg(i2c->dev, "Retrying transmission (%d)\n", retry);
udelay(100); udelay(100);
} }
clk_disable(i2c->clk);
return -EREMOTEIO; return -EREMOTEIO;
} }
@@ -910,6 +915,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, i2c); platform_set_drvdata(pdev, i2c);
dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev)); dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev));
clk_disable(i2c->clk);
return 0; return 0;
err_cpufreq: err_cpufreq:
@@ -977,7 +983,9 @@ static int s3c24xx_i2c_resume(struct device *dev)
struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev); struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
i2c->suspended = 0; i2c->suspended = 0;
clk_enable(i2c->clk);
s3c24xx_i2c_init(i2c); s3c24xx_i2c_init(i2c);
clk_disable(i2c->clk);
return 0; return 0;
} }