From: Wei Yongjun <weiyongjun@huaweicloud.com>
To: Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Wei Yongjun <weiyongjun1@huawei.com>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH -next v2 1/5] misc: microchip: pci1xxxx: fix error handling in gp_aux_bus_probe()
Date: Wed, 7 Sep 2022 14:58:04 +0000 [thread overview]
Message-ID: <20220907145808.1789249-1-weiyongjun@huaweicloud.com> (raw)
From: Wei Yongjun <weiyongjun1@huawei.com>
In some error handling path, resoures alloced may not released.
This patch fix them.
Fixes: 393fc2f5948f ("misc: microchip: pci1xxxx: load auxiliary bus driver for the PIO function in the multi-function endpoint of pci1xxxx device.")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
v1 - > v2: add fixes tag, fix pci_alloc_irq_vectors handing
---
drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
index bfc03028b34d..11f79f239006 100644
--- a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
+++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
@@ -87,12 +87,13 @@ static int gp_aux_bus_probe(struct pci_dev *pdev, const struct pci_device_id *id
retval = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
if (retval < 0)
- return retval;
+ goto err_aux_dev_init_1;
- pdev->irq = pci_irq_vector(pdev, 0);
- if (pdev->irq < 0)
- return retval;
+ retval = pci_irq_vector(pdev, 0);
+ if (retval < 0)
+ goto err_aux_dev_init_1;
+ pdev->irq = retval;
aux_bus->aux_device_wrapper[1]->gp_aux_data.irq_num = pdev->irq;
retval = auxiliary_device_init(&aux_bus->aux_device_wrapper[1]->aux_dev);
--
2.34.1
next reply other threads:[~2022-09-07 14:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 14:58 Wei Yongjun [this message]
2022-09-07 14:58 ` [PATCH -next v2 2/5] misc: microchip: pci1xxxx: Fix missing spin_lock_init() Wei Yongjun
2022-09-08 5:59 ` Kumaravel.Thiagarajan
2022-09-07 14:58 ` [PATCH -next v2 3/5] misc: microchip: pci1xxxx: Make symbol 'pci1xxxx_gpio_auxiliary_id_table' static Wei Yongjun
2022-09-08 6:02 ` Kumaravel.Thiagarajan
2022-09-07 14:58 ` [PATCH -next v2 4/5] misc: microchip: pci1xxxx: Add missing MODULE_DEVICE_TABLE Wei Yongjun
2022-09-08 6:04 ` Kumaravel.Thiagarajan
2022-09-07 14:58 ` [PATCH -next v2 5/5] misc: microchip: pci1xxxx: use module_auxiliary_driver Wei Yongjun
2022-09-08 6:16 ` Kumaravel.Thiagarajan
2022-09-08 5:56 ` [PATCH -next v2 1/5] misc: microchip: pci1xxxx: fix error handling in gp_aux_bus_probe() Kumaravel.Thiagarajan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220907145808.1789249-1-weiyongjun@huaweicloud.com \
--to=weiyongjun@huaweicloud.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=kumaravel.thiagarajan@microchip.com \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=weiyongjun1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).