From 96beb2ac53a41ea1a7a35ea0502e78e5076b928c Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Wed, 20 Jan 2010 13:49:45 -0700 Subject: [PATCH] --- yaml --- r: 180886 b: refs/heads/master c: b490e3704ccee12deb295f96029d68e0daf02feb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/dw_spi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e425bd3a9342..76db8536c04d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa0fcde66ac3360678360104b24492015e7b852b +refs/heads/master: b490e3704ccee12deb295f96029d68e0daf02feb diff --git a/trunk/drivers/spi/dw_spi.c b/trunk/drivers/spi/dw_spi.c index 31620fae77be..521d680af289 100644 --- a/trunk/drivers/spi/dw_spi.c +++ b/trunk/drivers/spi/dw_spi.c @@ -161,7 +161,7 @@ static inline void mrst_spi_debugfs_remove(struct dw_spi *dws) static void wait_till_not_busy(struct dw_spi *dws) { - unsigned long end = jiffies + usecs_to_jiffies(1000); + unsigned long end = jiffies + 1 + usecs_to_jiffies(1000); while (time_before(jiffies, end)) { if (!(dw_readw(dws, sr) & SR_BUSY))