summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChen Ni <nichen@iscas.ac.cn>2024-04-29 11:54:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-16 14:28:36 +0300
commitc5d19837cc7382385e80379f9d929c22056c7fb6 (patch)
treebaa7fabe95a001f4768ed56fbe41eaf3d5993680 /drivers
parent2bdad9da45e673da073c376641e4e7a28050e2fa (diff)
downloadlinux-c5d19837cc7382385e80379f9d929c22056c7fb6.tar.xz
HID: intel-ish-hid: ipc: Add check for pci_alloc_irq_vectors
[ Upstream commit 6baa4524027fd64d7ca524e1717c88c91a354b93 ] Add a check for the return value of pci_alloc_irq_vectors() and return error if it fails. [jkosina@suse.com: reworded changelog based on Srinivas' suggestion] Fixes: 74fbc7d371d9 ("HID: intel-ish-hid: add MSI interrupt support") Signed-off-by: Chen Ni <nichen@iscas.ac.cn> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/intel-ish-hid/ipc/pci-ish.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index f491d8b4e24c..05134ee80277 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -159,6 +159,11 @@ static int ish_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* request and enable interrupt */
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+ if (ret < 0) {
+ dev_err(dev, "ISH: Failed to allocate IRQ vectors\n");
+ return ret;
+ }
+
if (!pdev->msi_enabled && !pdev->msix_enabled)
irq_flag = IRQF_SHARED;