Merge branch 'master' into for-4.9

[karo-tx-linux.git] / drivers / ata / libahci.c

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index dcf2c724fd066c33cf74a3f502d2ae6ba3d276bc..5a1329e31609fe2cf7d8006c296eda20f7130076 100644 (file)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2378,7 +2378,7 @@ static int ahci_port_start(struct ata_port *ap)
        /*
         * Switch to per-port locking in case each port has its own MSI vector.
         */
-       if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) {
+       if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX)) {
                spin_lock_init(&pp->lock);
                ap->lock = &pp->lock;
        }