diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 13:28:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 13:28:39 -0700 |
| commit | ab0296319a8cb970f4e42659472bb40fbfae3e56 (patch) | |
| tree | 41b16ae5f9e7e3e28256f07f4ad9c0dc3020bf11 /drivers/spi/spi-sh-hspi.c | |
| parent | 50e6f8511a6b6a61611dae36794b5400cdc80ea1 (diff) | |
| parent | c1d926a5d2280e35d87dea3128e826fe98776ed4 (diff) | |
Merge tag 'spi-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A few nasty issues, particularly a race with the interrupt controller
in the xilinx driver, together with a couple of more minor fixes and a
much needed move of the mailing list away from sourceforge."
* tag 'spi-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: hspi: fixup long delay time
spi: spi-xilinx: Remove ISR race condition
spi: topcliff-pch: fix error return code in pch_spi_probe()
spi: topcliff-pch: Pass correct pointer to free_irq()
spi: Move mailing list to vger
Diffstat (limited to 'drivers/spi/spi-sh-hspi.c')
| -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) if ((mask & hspi_read(hspi, SPSR)) == val) return 0; - msleep(20); + udelay(10); } dev_err(hspi->dev, "timeout\n"); |