diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-07-20 15:05:19 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-07-20 15:05:19 +0000 |
| commit | 0615afea9fc72fd8d47c3ddfb314e0d1d53c51ad (patch) | |
| tree | 8f827047e0a4677c7db2923f7eb1f71dad7df953 /drivers/ata | |
| parent | e9646ca70100b35fd85b597c3af7534c075e0e3a (diff) | |
| parent | 795e84798fa7f6c753ded1a95037b4cf08db85d4 (diff) | |
Merge tag 'v5.4.133' into 5.4-2.3.x-imx
This is the 5.4.133 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci_sunxi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c index cb69b737cb49..56b695136977 100644 --- a/drivers/ata/ahci_sunxi.c +++ b/drivers/ata/ahci_sunxi.c @@ -200,7 +200,7 @@ static void ahci_sunxi_start_engine(struct ata_port *ap) } static const struct ata_port_info ahci_sunxi_port_info = { - .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, + .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ | ATA_FLAG_NO_DIPM, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, .port_ops = &ahci_platform_ops, |