1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index e364e86e84d7..280729325ebd 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1995,8 +1995,8 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
 
         VPRINTK("ENTER\n");
 
-        /* set scsi removeable (RMB) bit per ata bit */
-        if (ata_id_removeable(args->id))
+        /* set scsi removable (RMB) bit per ata bit */
+        if (ata_id_removable(args->id))
                 hdr[1] |= (1 << 7);
 
         if (args->dev->class == ATA_DEV_ZAC) {
@@ -2532,13 +2532,15 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf)
                 rbuf[15] = lowest_aligned;
 
                 if (ata_id_has_trim(args->id)) {
-                        rbuf[14] |= 0x80; /* TPE */
+                        rbuf[14] |= 0x80; /* LBPME */
 
-                        if (ata_id_has_zero_after_trim(args->id))
-                                rbuf[14] |= 0x40; /* TPRZ */
+                        if (ata_id_has_zero_after_trim(args->id) &&
+                            dev->horkage & ATA_HORKAGE_ZERO_AFTER_TRIM) {
+                                ata_dev_info(dev, "Enabling discard_zeroes_data\n");
+                                rbuf[14] |= 0x40; /* LBPRZ */
+                        }
                 }
         }
-
         return 0;
 }