2 files changed, 17 insertions, 6 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 884f52f43f8f..c228df298bd8 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1363,12 +1363,22 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
          * schedule EH_REVALIDATE operation to update the IDENTIFY DEVICE
          * cache
          */
-        if (ap->ops->error_handler &&
-            !need_sense && (qc->tf.command == ATA_CMD_SET_FEATURES) &&
-            ((qc->tf.feature == SETFEATURES_WC_ON) ||
-             (qc->tf.feature == SETFEATURES_WC_OFF))) {
-                ap->eh_info.action |= ATA_EH_REVALIDATE;
-                ata_port_schedule_eh(ap);
+        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)) {
+                                ap->eh_info.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 */
+                        ap->eh_info.action |= ATA_EH_REVALIDATE;
+                        ata_port_schedule_eh(ap);
+                        break;
+                }
         }
 
         /* For ATA pass thru (SAT) commands, generate a sense block if
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 3e95e5c402d4..703febb2df31 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -151,6 +151,7 @@ enum {
         ATA_CMD_WRITE_MULTI_EXT = 0x39,
         ATA_CMD_WRITE_MULTI_FUA_EXT = 0xCE,
         ATA_CMD_SET_FEATURES    = 0xEF,
+        ATA_CMD_SET_MULTI       = 0xC6,
         ATA_CMD_PACKET          = 0xA0,
         ATA_CMD_VERIFY          = 0x40,
         ATA_CMD_VERIFY_EXT      = 0x42,