1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 5267ab93d550..a92440dbef07 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -965,8 +965,7 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
         adap->owner     = THIS_MODULE;
         adap->class     = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         adap->algo      = &nmk_i2c_algo;
-        adap->timeout   = pdata->timeout ? msecs_to_jiffies(pdata->timeout) :
-                msecs_to_jiffies(20000);
+        adap->timeout   = msecs_to_jiffies(pdata->timeout);
         snprintf(adap->name, sizeof(adap->name),
                  "Nomadik I2C%d at %lx", pdev->id, (unsigned long)res->start);