]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
HID: intel-ish-hid: ipc: Add check for pci_alloc_irq_vectors
authorChen Ni <nichen@iscas.ac.cn>
Mon, 29 Apr 2024 08:54:22 +0000 (16:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2024 07:49:22 +0000 (09:49 +0200)
[ 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>
drivers/hid/intel-ish-hid/ipc/pci-ish.c

index 65e7eeb2fa64ecd2745cd270c6e07451e23c111f..ce5576ef3c861e667f36e72c174ea961954fea75 100644 (file)
@@ -172,6 +172,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;