diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2015-08-22 15:30:23 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-27 13:26:07 -0400 |
| commit | 514f0a944c001cdad24dce56757bfc3bb991c925 (patch) | |
| tree | fab000b94e164ec74cf2b62c2892063e76342d5d /drivers/ata | |
| parent | ccdf38d8643e69532044d3a5672d8dc8ebf7a1ab (diff) | |
| download | linux-rt-514f0a944c001cdad24dce56757bfc3bb991c925.tar.gz | |
Revert "libata: add ATA_HORKAGE_NOTRIM"
This reverts commit e7a84605061b205350654641d823e1ca9589ec24.
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index d6ff64248c23..0586f66d70fa 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -2514,8 +2514,7 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf) rbuf[14] = (lowest_aligned >> 8) & 0x3f; rbuf[15] = lowest_aligned; - if (ata_id_has_trim(args->id) && - !(dev->horkage & ATA_HORKAGE_NOTRIM)) { + if (ata_id_has_trim(args->id)) { rbuf[14] |= 0x80; /* TPE */ if (ata_id_has_zero_after_trim(args->id)) |