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

i2c-algo-pca: Rework waiting for a free bus

Browse Source 
Waiting for a free bus now accepts the timeout value in jiffies and does
proper checking using time_before.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Wolfram Sang
2009-03-28 21:34:45 +01:00
committed by Jean Delvare
parent eff9ec95ef
commit 8e99ada8de
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/i2c/algos/i2c-algo-pca.c
View File

@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/delay.h>
#include <linux/jiffies.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/i2c.h>
@@ -186,14 +187,16 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
int numbytes = 0;
int state;
int ret;
int timeout = i2c_adap->timeout;
unsigned long timeout = jiffies + i2c_adap->timeout;
while ((state = pca_status(adap)) != 0xf8 && timeout--) {
msleep(10);
}
if (state != 0xf8) {
dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state);
return -EAGAIN;
while (pca_status(adap) != 0xf8) {
if (time_before(jiffies, timeout)) {
msleep(10);
} else {
dev_dbg(&i2c_adap->dev, "bus is not idle. status is "
"%#04x\n", state);
return -EAGAIN;
}
}
DEB1("{{{ XFER %d messages\n", num);