--- drivers/i2c/busses/i2c-pca-platform.c

+++ drivers/i2c/busses/i2c-pca-platform.c

@@ -80,8 +80,8 @@ static void i2c_pca_pf_writebyte32(void

static int i2c_pca_pf_waitforcompletion(void *pd)

{

struct i2c_pca_pf_data *i2c = pd;

- long ret = ~0;

unsigned long timeout;

+ long ret;

if (i2c->irq) {

ret = wait_event_timeout(i2c->wait,

@@ -90,10 +90,13 @@ static int i2c_pca_pf_waitforcompletion(

} else {

/* Do polling */

timeout = jiffies + i2c->adap.timeout;

- while (((i2c->algo_data.read_byte(i2c, I2C_PCA_CON)

- & I2C_PCA_CON_SI) == 0)

- && (ret = time_before(jiffies, timeout)))

+ do {

+ ret = time_before(jiffies, timeout);

+ if (i2c->algo_data.read_byte(i2c, I2C_PCA_CON)

+ & I2C_PCA_CON_SI)

+ break;

udelay(100);

+ } while (ret);

}

return ret > 0;

@@ -221,7 +224,7 @@ static int __devinit i2c_pca_pf_probe(st

if (irq) {

ret = request_irq(irq, i2c_pca_pf_handler,

- IRQF_TRIGGER_FALLING, i2c->adap.name, i2c);

+ IRQF_TRIGGER_FALLING, pdev->name, i2c);

if (ret)

goto e_reqirq;

}