diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-04 12:11:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-04 12:11:46 +1100 |
| commit | 98f31367ca486f17d0e8a77ef9346a60a8658c10 (patch) | |
| tree | cddfcc6044070f27a6754be3b1353f1ff41db4b4 /include | |
| parent | 62360e6d18959a0c40e2e9e50d390e4efc4e3d8d (diff) | |
| parent | 4e5b932c829e9a6bf32ec80c6e1ce60121eef124 (diff) | |
Merge remote branch 'ide/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index e4135d6e0556..0ec612959042 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -125,8 +125,8 @@ struct ide_io_ports { * Timeouts for various operations: */ enum { - /* spec allows up to 20ms */ - WAIT_DRQ = HZ / 10, /* 100ms */ + /* spec allows up to 20ms, but CF cards and SSD drives need more */ + WAIT_DRQ = 1 * HZ, /* 1s */ /* some laptops are very slow */ WAIT_READY = 5 * HZ, /* 5s */ /* should be less than 3ms (?), if all ATAPI CD is closed at boot */ |