2 files changed, 20 insertions, 23 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 081e3dfb64d4..5aedd1af06e6 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5594,6 +5594,9 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
          * taken care of.
          */
         if (ap->ops->error_handler) {
+                struct ata_device *dev = qc->dev;
+                struct ata_eh_info *ehi = &dev->link->eh_info;
+
                 WARN_ON(ap->pflags & ATA_PFLAG_FROZEN);
 
                 if (unlikely(qc->err_mask))
@@ -5612,6 +5615,23 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
                 if (qc->flags & ATA_QCFLAG_RESULT_TF)
                         fill_result_tf(qc);
 
+                /* Some commands need post-processing after successful
+                 * completion.
+                 */
+                switch (qc->tf.command) {
+                case ATA_CMD_SET_FEATURES:
+                        if (qc->tf.feature != SETFEATURES_WC_ON &&
+                            qc->tf.feature != SETFEATURES_WC_OFF)
+                                break;
+                        /* fall through */
+                case ATA_CMD_INIT_DEV_PARAMS: /* CHS translation changed */
+                case ATA_CMD_SET_MULTI: /* multi_count changed */
+                        /* revalidate device */
+                        ehi->dev_action[dev->devno] |= ATA_EH_REVALIDATE;
+                        ata_port_schedule_eh(ap);
+                        break;
+                }
+
                 __ata_qc_complete(qc);
         } else {
                 if (qc->flags & ATA_QCFLAG_EH_SCHEDULED)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index f5d5420a1ba2..f752eddc19ed 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1361,33 +1361,10 @@ nothing_to_do:
 static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
-        struct ata_eh_info *ehi = &qc->dev->link->eh_info;
         struct scsi_cmnd *cmd = qc->scsicmd;
         u8 *cdb = cmd->cmnd;
         int need_sense = (qc->err_mask != 0);
 
-        /* We snoop the SET_FEATURES - Write Cache ON/OFF command, and
-         * schedule EH_REVALIDATE operation to update the IDENTIFY DEVICE
-         * cache
-         */
-        if (ap->ops->error_handler && !need_sense) {
-                switch (qc->tf.command) {
-                case ATA_CMD_SET_FEATURES:
-                        if ((qc->tf.feature == SETFEATURES_WC_ON) ||
-                            (qc->tf.feature == SETFEATURES_WC_OFF)) {
-                                ehi->action |= ATA_EH_REVALIDATE;
-                                ata_port_schedule_eh(ap);
-                        }
-                        break;
-
-                case ATA_CMD_INIT_DEV_PARAMS: /* CHS translation changed */
-                case ATA_CMD_SET_MULTI: /* multi_count changed */
-                        ehi->action |= ATA_EH_REVALIDATE;
-                        ata_port_schedule_eh(ap);
-                        break;
-                }
-        }
-
         /* For ATA pass thru (SAT) commands, generate a sense block if
          * user mandated it or if there's an error.  Note that if we
          * generate because the user forced us to, a check condition