diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-04 18:52:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-04 18:52:04 +0100 |
| commit | 2570ce2a92608e613669fd40f9d3ee4b8384b0d4 (patch) | |
| tree | cc1d22602c76e24aea2eb8e16ede4c213451fbcc /drivers/spi | |
| parent | df91ed6d46a79bb8d3227939c0a84a78e7cf4e8e (diff) | |
| parent | bc2bfffc3866e8c87dde19d5619262a810a51ed8 (diff) | |
| download | kernel_goldelico_gta04-2570ce2a92608e613669fd40f9d3ee4b8384b0d4.zip kernel_goldelico_gta04-2570ce2a92608e613669fd40f9d3ee4b8384b0d4.tar.gz kernel_goldelico_gta04-2570ce2a92608e613669fd40f9d3ee4b8384b0d4.tar.bz2 | |
Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sh-hspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index 60cfae5..eab593e 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"); |