Skip to content

Commit

Permalink
Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Jun 4, 2013
2 parents df91ed6 + bc2bfff commit 2570ce2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/spi/spi-sh-hspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 2570ce2

Please sign in to comment.