Add check for the return value of pci_alloc_irq_vectors() and return
the error if it fails in order to catch the error.
Fixes: 74fbc7d371d9 ("HID: intel-ish-hid: add MSI interrupt support")
Signed-off-by: Chen Ni <[email protected]>
---
drivers/hid/intel-ish-hid/ipc/pci-ish.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index e79d72f7db2a..9b9bc58f0524 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -174,6 +174,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;
--
2.25.1
On Mon, 2024-04-29 at 16:54 +0800, Chen Ni wrote:
> Add check for the return value of pci_alloc_irq_vectors() and return
> the error if it fails in order to catch the error.
>
You can write as
"
Add a check for the return value of pci_alloc_irq_vectors() and return
error if it fails.
"
Thanks,
Srinivas
> Fixes: 74fbc7d371d9 ("HID: intel-ish-hid: add MSI interrupt support")
> Signed-off-by: Chen Ni <[email protected]>
> ---
> drivers/hid/intel-ish-hid/ipc/pci-ish.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> index e79d72f7db2a..9b9bc58f0524 100644
> --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> @@ -174,6 +174,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;
>
On Thu, 2 May 2024, srinivas pandruvada wrote:
> On Mon, 2024-04-29 at 16:54 +0800, Chen Ni wrote:
> > Add check for the return value of pci_alloc_irq_vectors() and return
> > the error if it fails in order to catch the error.
> >
> You can write as
> "
> Add a check for the return value of pci_alloc_irq_vectors() and return
> error if it fails.
> "
Srinivas,
my understanding is that with the changelog rewroding this patch has your
Ack?
Thanks,
--
Jiri Kosina
SUSE Labs
On Mon, 2024-05-06 at 23:11 +0200, Jiri Kosina wrote:
> On Thu, 2 May 2024, srinivas pandruvada wrote:
>
> > On Mon, 2024-04-29 at 16:54 +0800, Chen Ni wrote:
> > > Add check for the return value of pci_alloc_irq_vectors() and
> > > return
> > > the error if it fails in order to catch the error.
> > >
> > You can write as
> > "
> > Add a check for the return value of pci_alloc_irq_vectors() and
> > return
> > error if it fails.
> > "
>
Hi Jiri,
> Srinivas,
>
> my understanding is that with the changelog rewroding this patch has
> your
> Ack?
Yes, just to make it more clear. With that.
Acked-by: Srinivas Pandruvada <[email protected]>
Thanks,
Srinivas
>
> Thanks,
>
On Mon, 6 May 2024, srinivas pandruvada wrote:
> > my understanding is that with the changelog rewroding this patch has
> > your
> > Ack?
> Yes, just to make it more clear. With that.
>
> Acked-by: Srinivas Pandruvada <[email protected]>
Thanks, now applied.
--
Jiri Kosina
SUSE Labs