3 files changed, 4 insertions, 5 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index a28569d0081d..7a5392c8ec6f 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -3909,7 +3909,6 @@ static inline int ata_should_dma_map(struct ata_queued_cmd *qc)
 
         case ATA_PROT_ATAPI:
         case ATA_PROT_PIO:
-        case ATA_PROT_PIO_MULT:
                 if (ap->flags & ATA_FLAG_PIO_DMA)
                         return 1;
 
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 3aaa74cbef1d..cebf9b31b516 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2379,9 +2379,6 @@ ata_scsi_map_proto(u8 byte1)
 
                 case 4:         /* PIO Data-in */
                 case 5:         /* PIO Data-out */
-                        if (byte1 & 0xe0) {
-                                return ATA_PROT_PIO_MULT;
-                        }
                         return ATA_PROT_PIO;
 
                 case 10:        /* Device Reset */
@@ -2420,6 +2417,10 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
         if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)
                 goto invalid_fld;
 
+        if (scsicmd[1] & 0xe0)
+                /* PIO multi not supported yet */
+                goto invalid_fld;
+
         /*
          * 12 and 16 byte CDBs use different offsets to
          * provide the various register values.
diff --git a/include/linux/ata.h b/include/linux/ata.h
index b02a16c435e7..6b188b3b61dd 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -204,7 +204,6 @@ enum ata_tf_protocols {
         ATA_PROT_UNKNOWN,       /* unknown/invalid */
         ATA_PROT_NODATA,        /* no data */
         ATA_PROT_PIO,           /* PIO single sector */
-        ATA_PROT_PIO_MULT,      /* PIO multiple sector */
         ATA_PROT_DMA,           /* DMA */
         ATA_PROT_ATAPI,         /* packet command, PIO data xfer*/
         ATA_PROT_ATAPI_NODATA,  /* packet command, no data */