1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 574414689253..c948a5c17a5d 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -460,6 +460,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->mwdma_mask                = tmp_hwif->mwdma_mask;
         hwif->swdma_mask                = tmp_hwif->swdma_mask;
 
+        hwif->cbl                       = tmp_hwif->cbl;
+
         hwif->chipset                   = tmp_hwif->chipset;
         hwif->hold                      = tmp_hwif->hold;
 
@@ -533,7 +535,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->extra_base                = tmp_hwif->extra_base;
         hwif->extra_ports               = tmp_hwif->extra_ports;
         hwif->autodma                   = tmp_hwif->autodma;
-        hwif->udma_four                 = tmp_hwif->udma_four;
 
         hwif->hwif_data                 = tmp_hwif->hwif_data;
 }
@@ -1548,7 +1549,11 @@ static int __init ide_setup(char *s)
                                 goto bad_option;
                         case -7: /* ata66 */
 #ifdef CONFIG_BLK_DEV_IDEPCI
-                                hwif->udma_four = 1;
+                                /*
+                                 * Use ATA_CBL_PATA40_SHORT so drive side
+                                 * cable detection is also overriden.
+                                 */
+                                hwif->cbl = ATA_CBL_PATA40_SHORT;
                                 goto obsolete_option;
 #else
                                 goto bad_hwif;