Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[sfrench/cifs-2.6.git] / drivers / ata / ahci.c

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index db4380d7003115ef8c4d05c1ca3543adce0efecb..9d715ae5ff6b73b6bd09690b95e9686f196e9cdb 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1295,6 +1295,14 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 */
                if (!(hpriv->flags & AHCI_HFLAG_NO_FPDMA_AA))
                        pi.flags |= ATA_FLAG_FPDMA_AA;
+
+               /*
+                * All AHCI controllers should be forward-compatible
+                * with the new auxiliary field. This code should be
+                * conditionalized if any buggy AHCI controllers are
+                * encountered.
+                */
+               pi.flags |= ATA_FLAG_FPDMA_AUX;
        }
 
        if (hpriv->cap & HOST_CAP_PMP)