diff options
author | Alexander Gordeev <agordeev@redhat.com> | 2013-12-16 03:34:54 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 11:45:05 -0500 |
commit | a384c8924a8be3f5cf7dac06c04e9dd4a78b41df (patch) | |
tree | b86d44ed88cc9e16a5f1c5082778d216c7edc347 /arch/s390 | |
parent | 1c51b50c2995f543d145d3bce78029ac9f8ca6b3 (diff) |
s390/PCI: Fix single MSI only check
Multiple MSIs have never been supported on s390 architecture, but the
platform code fails to report single MSI only.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index bf7c73d71eef..6f3788e3363e 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c | |||
@@ -409,6 +409,8 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) | |||
409 | 409 | ||
410 | if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI) | 410 | if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI) |
411 | return -EINVAL; | 411 | return -EINVAL; |
412 | if (type == PCI_CAP_ID_MSI && nvec > 1) | ||
413 | return 1; | ||
412 | msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX); | 414 | msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX); |
413 | msi_vecs = min_t(unsigned int, msi_vecs, CONFIG_PCI_NR_MSI); | 415 | msi_vecs = min_t(unsigned int, msi_vecs, CONFIG_PCI_NR_MSI); |
414 | 416 | ||