[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH AUTOSEL 6.0 21/44] xen/platform-pci: add missing free_irq() in error path



From: ruanjinjie <ruanjinjie@xxxxxxxxxx>

[ Upstream commit c53717e1e3f0d0f9129b2e0dbc6dcc5e0a8132e9 ]

free_irq() is missing in case of error in platform_pci_probe(), fix that.

Signed-off-by: ruanjinjie <ruanjinjie@xxxxxxxxxx>
Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@xxxxxxxx>
Link: https://lore.kernel.org/r/20221114112124.1965611-1-ruanjinjie@xxxxxxxxxx
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
 drivers/xen/platform-pci.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index 18f0ed8b1f93..6ebd819338ec 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -144,7 +144,7 @@ static int platform_pci_probe(struct pci_dev *pdev,
                if (ret) {
                        dev_warn(&pdev->dev, "Unable to set the evtchn callback 
"
                                         "err=%d\n", ret);
-                       goto out;
+                       goto irq_out;
                }
        }
 
@@ -152,13 +152,16 @@ static int platform_pci_probe(struct pci_dev *pdev,
        grant_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes);
        ret = gnttab_setup_auto_xlat_frames(grant_frames);
        if (ret)
-               goto out;
+               goto irq_out;
        ret = gnttab_init();
        if (ret)
                goto grant_out;
        return 0;
 grant_out:
        gnttab_free_auto_xlat_frames();
+irq_out:
+       if (!xen_have_vector_callback)
+               free_irq(pdev->irq, pdev);
 out:
        pci_release_region(pdev, 0);
 mem_out:
-- 
2.35.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.