1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 4e31071acc02..698ce2cea52c 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2393,9 +2393,11 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
         }
 
         /* PDIAG- should have been released, ask cable type if post-reset */
-        if (ata_is_host_link(link) && ap->ops->cable_detect &&
-            (ehc->i.flags & ATA_EHI_DID_RESET))
-                ap->cbl = ap->ops->cable_detect(ap);
+        if ((ehc->i.flags & ATA_EHI_DID_RESET) && ata_is_host_link(link)) {
+                if (ap->ops->cable_detect)
+                        ap->cbl = ap->ops->cable_detect(ap);
+                ata_force_cbl(ap);
+        }
 
         /* Configure new devices forward such that user doesn't see
          * device detection messages backwards.