3 files changed, 11 insertions, 8 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index ccab1d7ceada..90db054fa994 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2627,13 +2627,14 @@ int ata_std_prereset(struct ata_port *ap)
         const unsigned long *timing;
         int rc;
 
-        /* hotplug? */
-        if (ehc->i.flags & ATA_EHI_HOTPLUGGED) {
-                if (ap->flags & ATA_FLAG_HRST_TO_RESUME)
-                        ehc->i.action |= ATA_EH_HARDRESET;
-                if (ap->flags & ATA_FLAG_SKIP_D2H_BSY)
-                        ata_wait_spinup(ap);
-        }
+        /* handle link resume & hotplug spinup */
+        if ((ehc->i.flags & ATA_EHI_RESUME_LINK) &&
+            (ap->flags & ATA_FLAG_HRST_TO_RESUME))
+                ehc->i.action |= ATA_EH_HARDRESET;
+
+        if ((ehc->i.flags & ATA_EHI_HOTPLUGGED) &&
+            (ap->flags & ATA_FLAG_SKIP_D2H_BSY))
+                ata_wait_spinup(ap);
 
         /* if we're about to do hardreset, nothing more to do */
         if (ehc->i.action & ATA_EH_HARDRESET)
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 153452e77264..ba3e515f2b9d 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -3011,6 +3011,7 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,
                 if (dev) {
                         ap->eh_info.probe_mask |= 1 << dev->devno;
                         ap->eh_info.action |= ATA_EH_SOFTRESET;
+                        ap->eh_info.flags |= ATA_EHI_RESUME_LINK;
                 } else
                         rc = -EINVAL;
         }
diff --git a/include/linux/libata.h b/include/linux/libata.h
index b5d247d780f8..4d4ed2c8fec7 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -259,6 +259,7 @@ enum {
 
         /* ata_eh_info->flags */
         ATA_EHI_HOTPLUGGED      = (1 << 0),  /* could have been hotplugged */
+        ATA_EHI_RESUME_LINK     = (1 << 1),  /* need to resume link */
 
         ATA_EHI_DID_RESET       = (1 << 16), /* already reset this port */
 
@@ -836,7 +837,7 @@ static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
         if (ehi->flags & ATA_EHI_HOTPLUGGED)
                 return;
 
-        ehi->flags |= ATA_EHI_HOTPLUGGED;
+        ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK;
         ehi->hotplug_timestamp = jiffies;
 
         ehi->err_mask |= AC_ERR_ATA_BUS;