diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:56 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:56 +0800 |
| commit | 0f7fc48d4378ac087ef7e69a6e675b0d9280999e (patch) | |
| tree | f0c005b00166eca0ce2648487cde89866447645f /drivers/ata/sata_sil.c | |
| parent | 4fc0eccae84a29106ed944588ba641e9039ccfbc (diff) | |
| parent | fbb0b56de45bc81681eeeaec29e6c1e3ff12a200 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.03-androidlinux-linaro-lsk-v3.10-android
Diffstat (limited to 'drivers/ata/sata_sil.c')
| -rw-r--r-- | drivers/ata/sata_sil.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index dd1faa564eb2..cdfb98e70cfd 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -631,6 +631,9 @@ static void sil_dev_config(struct ata_device *dev) unsigned int n, quirks = 0; unsigned char model_num[ATA_ID_PROD_LEN + 1]; + /* This controller doesn't support trim */ + dev->horkage |= ATA_HORKAGE_NOTRIM; + ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num)); for (n = 0; sil_blacklist[n].product; n++) |