Merge branch 'acpica' into release

[firefly-linux-kernel-4.4.55.git] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index e4135d6e05568ebbbae8d0716349f2a65574079c..0ec612959042dbfece0dbac4dbc33c11c4da43f5 100644 (file)
--- 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 */