diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-04 13:52:04 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-04 13:52:04 -0400 |
| commit | 2570ce2a92608e613669fd40f9d3ee4b8384b0d4 (patch) | |
| tree | cc1d22602c76e24aea2eb8e16ede4c213451fbcc | |
| parent | df91ed6d46a79bb8d3227939c0a84a78e7cf4e8e (diff) | |
| parent | bc2bfffc3866e8c87dde19d5619262a810a51ed8 (diff) | |
Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
| -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 60cfae51c713..eab593eaaafa 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) | |||
| 89 | if ((mask & hspi_read(hspi, SPSR)) == val) | 89 | if ((mask & hspi_read(hspi, SPSR)) == val) |
| 90 | return 0; | 90 | return 0; |
| 91 | 91 | ||
| 92 | msleep(20); | 92 | udelay(10); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | dev_err(hspi->dev, "timeout\n"); | 95 | dev_err(hspi->dev, "timeout\n"); |