i2c: Adapter timeout is in jiffies

[pandora-kernel.git] / drivers / i2c / busses / i2c-ibm_iic.c

diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 88f0db7..8b92a46 100644 (file)
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -415,7 +415,7 @@ static int iic_wait_for_tc(struct ibm_iic_private* dev){
        if (dev->irq >= 0){
                /* Interrupt mode */
                ret = wait_event_interruptible_timeout(dev->wq,
-                       !(in_8(&iic->sts) & STS_PT), dev->adap.timeout * HZ);
+                       !(in_8(&iic->sts) & STS_PT), dev->adap.timeout);
 
                if (unlikely(ret < 0))
                        DBG("%d: wait interrupted\n", dev->idx);
@@ -426,7 +426,7 @@ static int iic_wait_for_tc(struct ibm_iic_private* dev){
        }
        else {
                /* Polling mode */
-               unsigned long x = jiffies + dev->adap.timeout * HZ;
+               unsigned long x = jiffies + dev->adap.timeout;
 
                while (in_8(&iic->sts) & STS_PT){
                        if (unlikely(time_after(jiffies, x))){
@@ -748,7 +748,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
        i2c_set_adapdata(adap, dev);
        adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
        adap->algo = &iic_algo;
-       adap->timeout = 1;
+       adap->timeout = HZ;
 
        ret = i2c_add_adapter(adap);
        if (ret  < 0) {