diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-12-23 23:47:35 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-12-23 23:47:35 +0100 |
commit | 769b0946b81a11ea495d94cdf6768837a3602998 (patch) | |
tree | c35511c9ca8311fc291cd3fb523fc5e7ae9321ee /linux/src/drivers/block/ide.h | |
parent | 4133b7f7992a38b19d5bfe47591e932e92d958e8 (diff) | |
parent | db8ec819c3863040aceae97ab35ef5c6ef3c898f (diff) |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/gnumach
Diffstat (limited to 'linux/src/drivers/block/ide.h')
-rw-r--r-- | linux/src/drivers/block/ide.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/src/drivers/block/ide.h b/linux/src/drivers/block/ide.h index 3351390..edeedc9 100644 --- a/linux/src/drivers/block/ide.h +++ b/linux/src/drivers/block/ide.h @@ -152,7 +152,8 @@ typedef unsigned char byte; /* used everywhere */ /* * Timeouts for various operations: */ -#define WAIT_DRQ (5*HZ/100) /* 50msec - spec allows up to 20ms */ +#define WAIT_DRQ (1*HZ) /* 1s - spec allows up to 20ms, but CF + * cards and SSD drives need more */ #ifdef CONFIG_APM #define WAIT_READY (5*HZ) /* 5sec - some laptops are very slow */ #else |