diff mbox

[5/9] PCI/MSI/s390: Make return values only 0/-errno when MSIs allocated

Message ID 20130909152658.GG24962@dhcp-26-207.brq.redhat.com
State Changes Requested
Headers show

Commit Message

Alexander Gordeev Sept. 9, 2013, 3:26 p.m. UTC 
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
 arch/s390/pci/pci.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Sergei Shtylyov Sept. 10, 2013, 12:42 p.m. UTC | #1 
Hello.

On 09-09-2013 19:26, Alexander Gordeev wrote:

> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> ---
>   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 f17a834..c79c6e4 100644
> --- a/arch/s390/pci/pci.c
> +++ b/arch/s390/pci/pci.c
> @@ -427,6 +427,8 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
>   	pr_debug("%s: requesting %d MSI-X interrupts...", __func__, nvec);
>   	if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI)
>   		return -EINVAL;
> +	if (type == PCI_CAP_ID_MSI && nvec > 1)
> +		return 1;

    This contradicts to the patch subject.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Gordeev Sept. 10, 2013, 1:09 p.m. UTC | #2 
On Tue, Sep 10, 2013 at 04:42:17PM +0400, Sergei Shtylyov wrote:
>    This contradicts to the patch subject.

Sorry, Sergei et al.
I screwed this series is bit. The second 5/9 fixes that.

> WBR, Sergei
>
diff mbox

Patch

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index f17a834..c79c6e4 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -427,6 +427,8 @@  int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 	pr_debug("%s: requesting %d MSI-X interrupts...", __func__, nvec);
 	if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI)
 		return -EINVAL;
+	if (type == PCI_CAP_ID_MSI && nvec > 1)
+		return 1;
 	msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX);
 	msi_vecs = min_t(unsigned int, msi_vecs, CONFIG_PCI_NR_MSI);