Browse Source

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

Mark Brown 12 years ago
parent
commit
2570ce2a92
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/spi/spi-sh-hspi.c

+ 1 - 1
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");