Merge remote-tracking branch 'spi/fix/hspi' into spi-linus

2570ce2a · Mark Brown · df91ed6d · bc2bfffc · 2570ce2a
Commit 2570ce2a authored Jun 04, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi-sh-hspi.c drivers/spi/spi-sh-hspi.c +1 -1

No files found.
--- 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");