From fe0e07104ad75e5aa8c6faa47edef7b142e63ae5 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Wed, 10 Apr 2013 00:36:41 +0000 Subject: [PATCH] --- yaml --- r: 371007 b: refs/heads/master c: 1451b91ffef5a2ac7df28a6d8fc270ccbee5d8ac h: refs/heads/master i: 371005: 4e7e64d15276954e6e975d9cfd26f027c3cc6d25 371003: 591b6f96bb9d05455954de455a6a0f795674d4ce 370999: 9af71a407a8c9287cae28d1f8bed6c68dd5fa9b9 370991: 1f5a9fdddc167b0c12f45f86cca716dc90e8ad53 370975: 3435612ef68682cfd205cc2457048a79940ee9fc 370943: 4a6924e89c4df7a3a2a1324e30ca25955f6c80aa v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-designware-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 58f5bd9ceeb3..042fe8018fca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ca4ed8715a6677ce2cdd7aa471685e653b5114d +refs/heads/master: 1451b91ffef5a2ac7df28a6d8fc270ccbee5d8ac diff --git a/trunk/drivers/i2c/busses/i2c-designware-core.c b/trunk/drivers/i2c/busses/i2c-designware-core.c index 5cc4ebf29b0a..7c10c5bd36dc 100644 --- a/trunk/drivers/i2c/busses/i2c-designware-core.c +++ b/trunk/drivers/i2c/busses/i2c-designware-core.c @@ -355,7 +355,7 @@ static int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev) return -ETIMEDOUT; } timeout--; - mdelay(1); + usleep_range(1000, 1100); } return 0;