summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-04 18:52:04 +0100
committerMark Brown <broonie@linaro.org>2013-06-04 18:52:04 +0100
commit2570ce2a92608e613669fd40f9d3ee4b8384b0d4 (patch)
treecc1d22602c76e24aea2eb8e16ede4c213451fbcc /drivers/spi
parentdf91ed6d46a79bb8d3227939c0a84a78e7cf4e8e (diff)
parentbc2bfffc3866e8c87dde19d5619262a810a51ed8 (diff)
downloadlinux-3.10-2570ce2a92608e613669fd40f9d3ee4b8384b0d4.tar.gz
linux-3.10-2570ce2a92608e613669fd40f9d3ee4b8384b0d4.tar.bz2
linux-3.10-2570ce2a92608e613669fd40f9d3ee4b8384b0d4.zip
Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-sh-hspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 60cfae51c71..eab593eaaaf 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -89,7 +89,7 @@ static int hspi_status_check_timeout(struct hspi_priv *hspi, u32 mask, u32 val)
if ((mask & hspi_read(hspi, SPSR)) == val)
return 0;
- msleep(20);
+ udelay(10);
}
dev_err(hspi->dev, "timeout\n");