projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
spi
/
spi-sh-hspi.c
diff --git
a/drivers/spi/spi-sh-hspi.c
b/drivers/spi/spi-sh-hspi.c
index 60cfae51c713818ef630f802db2e2e8c747f98d7..eab593eaaafa00f1c269dda9f60a70de72f1d98b 100644
(file)
--- 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(2
0);
+
udelay(1
0);
}
dev_err(hspi->dev, "timeout\n");