2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index a93247cc395a..d2409a8acece 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2010,8 +2010,13 @@ void ata_eh_autopsy(struct ata_port *ap)
                 struct ata_eh_context *mehc = &ap->link.eh_context;
                 struct ata_eh_context *sehc = &ap->slave_link->eh_context;
 
+                /* transfer control flags from master to slave */
+                sehc->i.flags |= mehc->i.flags & ATA_EHI_TO_SLAVE_MASK;
+
+                /* perform autopsy on the slave link */
                 ata_eh_link_autopsy(ap->slave_link);
 
+                /* transfer actions from slave to master and clear slave */
                 ata_eh_about_to_do(ap->slave_link, NULL, ATA_EH_ALL_ACTIONS);
                 mehc->i.action          |= sehc->i.action;
                 mehc->i.dev_action[1]   |= sehc->i.dev_action[1];
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 947cf84e555d..c261aa0584b1 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -340,6 +340,9 @@ enum {
 
         ATA_EHI_DID_RESET       = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,
 
+        /* mask of flags to transfer *to* the slave link */
+        ATA_EHI_TO_SLAVE_MASK   = ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET,
+
         /* max tries if error condition is still set after ->error_handler */
         ATA_EH_MAX_TRIES        = 5,