1 files changed, 15 insertions, 3 deletions

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 86a40582999..1eb4e020eb5 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1594,9 +1594,21 @@ static int nv_hardreset(struct ata_link *link, unsigned int *class,
             !ata_dev_enabled(link->device))
                 sata_link_hardreset(link, sata_deb_timing_hotplug, deadline,
                                     NULL, NULL);
-        else if (!(ehc->i.flags & ATA_EHI_QUIET))
-                ata_link_printk(link, KERN_INFO,
-                                "nv: skipping hardreset on occupied port\n");
+        else {
+                const unsigned long *timing = sata_ehc_deb_timing(ehc);
+                int rc;
+
+                if (!(ehc->i.flags & ATA_EHI_QUIET))
+                        ata_link_printk(link, KERN_INFO, "nv: skipping "
+                                        "hardreset on occupied port\n");
+
+                /* make sure the link is online */
+                rc = sata_link_resume(link, timing, deadline);
+                /* whine about phy resume failure but proceed */
+                if (rc && rc != -EOPNOTSUPP)
+                        ata_link_printk(link, KERN_WARNING, "failed to resume "
+                                        "link (errno=%d)\n", rc);
+        }
 
         /* device signature acquisition is unreliable */
         return -EAGAIN;