Merge tag 'asoc-v5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v5.1

Lots and lots of new drivers so far, a highlight being the MediaTek
BTCVSD which is a driver for a Bluetooth radio chip - the first such
driver we've had upstream.  Hopefully we will soon also see a baseband
with an upstream driver!

 - Support for only powering up channels that are actively being used.
 - Quite a few improvements to simplify the generic card drivers,
   especially the merge of the SCU cards into the main generic drivers.
 - Lots of fixes for probing on Intel systems, trying to rationalize
   things to look more standard from a framework point of view.
 - New drivers for Asahi Kasei Microdevices AK4497, Cirrus Logic CS4341,
   Google ChromeOS embedded controllers, Ingenic JZ4725B, MediaTek
   BTCVSD, MT8183 and MT6358, NXP MICFIL, Rockchip RK3328, Spreadtrum
   DMA controllers, Qualcomm WCD9335, Xilinx S/PDIF and PCM formatters.

1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 7a1c8a09efa5..4c0b47867258 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1168,7 +1168,8 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
                                    const struct irq_affinity *affd)
 {
         static const struct irq_affinity msi_default_affd;
-        int vecs = -ENOSPC;
+        int msix_vecs = -ENOSPC;
+        int msi_vecs = -ENOSPC;
 
         if (flags & PCI_IRQ_AFFINITY) {
                 if (!affd)
@@ -1179,16 +1180,17 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
         }
 
         if (flags & PCI_IRQ_MSIX) {
-                vecs = __pci_enable_msix_range(dev, NULL, min_vecs, max_vecs,
-                                affd);
-                if (vecs > 0)
-                        return vecs;
+                msix_vecs = __pci_enable_msix_range(dev, NULL, min_vecs,
+                                                    max_vecs, affd);
+                if (msix_vecs > 0)
+                        return msix_vecs;
         }
 
         if (flags & PCI_IRQ_MSI) {
-                vecs = __pci_enable_msi_range(dev, min_vecs, max_vecs, affd);
-                if (vecs > 0)
-                        return vecs;
+                msi_vecs = __pci_enable_msi_range(dev, min_vecs, max_vecs,
+                                                  affd);
+                if (msi_vecs > 0)
+                        return msi_vecs;
         }
 
         /* use legacy irq if allowed */
@@ -1199,7 +1201,9 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
                 }
         }
 
-        return vecs;
+        if (msix_vecs == -ENOSPC)
+                return -ENOSPC;
+        return msi_vecs;
 }
 EXPORT_SYMBOL(pci_alloc_irq_vectors_affinity);