diff options
author | Christoph Hellwig <hch@lst.de> | 2017-05-20 18:59:54 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-13 19:48:07 +0200 |
commit | 6391346223496fdf4ac510ad4fae161daba23f80 (patch) | |
tree | 90b9fc049d81311f41c5d4486fafae08a3baa30d /include | |
parent | c198e227316337301f682c97c5880014b3aeb3aa (diff) |
PCI/msi: fix the pci_alloc_irq_vectors_affinity stub
[ Upstream commit 83b4605b0c16cde5b00c8cf192408d51eab75402 ]
We need to return an error for any call that asks for MSI / MSI-X
vectors only, so that non-trivial fallback logic can work properly.
Also valid dev->irq and use the "correct" errno value based on feedback
from Linus.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Steven Rostedt <rostedt@goodmis.org>
Fixes: aff17164 ("PCI: Provide sensible IRQ vector alloc/free routines")
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 1b711796d989..36522905685b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1348,9 +1348,9 @@ static inline int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, unsigned int max_vecs, unsigned int flags) { - if (min_vecs > 1) - return -EINVAL; - return 1; + if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1 && dev->irq) + return 1; + return -ENOSPC; } static inline void pci_free_irq_vectors(struct pci_dev *dev) { |