Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

[~andy/linux] / drivers / i2c / busses / i2c-nomadik.c

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index e6b93f3ca8676bb6a37b8577277b5ac284c8d4ad..5e6f1eed4f83f233da76202c70d7564f773d3e1c 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -969,8 +969,7 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
        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);
        adap->nr = atomic_read(&adapter_id);
        snprintf(adap->name, sizeof(adap->name),
                 "Nomadik I2C%d at %pR", adap->nr, &adev->res);