* [PATCH] tty: moxa: Refine error handling in moxa_pci_probe
@ 2022-08-01 8:53 GONG, Ruiqi
2022-08-01 9:01 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: GONG, Ruiqi @ 2022-08-01 8:53 UTC (permalink / raw)
To: Greg Kroah-Hartman, Jiri Slaby; +Cc: linux-kernel, wangweiyang2, gongruiqi1
Add pci_disable_device() into the error handling, and therefore make the
function not jump to err if pci_enable_device() failed.
Signed-off-by: GONG, Ruiqi <gongruiqi1@huawei.com>
---
drivers/tty/moxa.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index f3c72ab1476c..4432a39331d3 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1239,7 +1239,7 @@ static int moxa_pci_probe(struct pci_dev *pdev,
retval = pci_enable_device(pdev);
if (retval) {
dev_err(&pdev->dev, "can't enable pci device\n");
- goto err;
+ return retval;
}
for (i = 0; i < MAX_BOARDS; i++)
@@ -1300,6 +1300,7 @@ static int moxa_pci_probe(struct pci_dev *pdev,
err_reg:
pci_release_region(pdev, 2);
err:
+ pci_disable_device(pdev);
return retval;
}
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] tty: moxa: Refine error handling in moxa_pci_probe
2022-08-01 8:53 [PATCH] tty: moxa: Refine error handling in moxa_pci_probe GONG, Ruiqi
@ 2022-08-01 9:01 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2022-08-01 9:01 UTC (permalink / raw)
To: GONG, Ruiqi; +Cc: Jiri Slaby, linux-kernel, wangweiyang2
On Mon, Aug 01, 2022 at 04:53:56PM +0800, GONG, Ruiqi wrote:
> Add pci_disable_device() into the error handling, and therefore make the
> function not jump to err if pci_enable_device() failed.
>
> Signed-off-by: GONG, Ruiqi <gongruiqi1@huawei.com>
> ---
> drivers/tty/moxa.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
> index f3c72ab1476c..4432a39331d3 100644
> --- a/drivers/tty/moxa.c
> +++ b/drivers/tty/moxa.c
> @@ -1239,7 +1239,7 @@ static int moxa_pci_probe(struct pci_dev *pdev,
> retval = pci_enable_device(pdev);
> if (retval) {
> dev_err(&pdev->dev, "can't enable pci device\n");
> - goto err;
> + return retval;
> }
>
> for (i = 0; i < MAX_BOARDS; i++)
> @@ -1300,6 +1300,7 @@ static int moxa_pci_probe(struct pci_dev *pdev,
> err_reg:
> pci_release_region(pdev, 2);
> err:
> + pci_disable_device(pdev);
Are you sure you want to do this? What happens if this is a
multi-function device, you just turned it off, right?
How did you test this change? Do you have the hardware for it?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-01 9:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-01 8:53 [PATCH] tty: moxa: Refine error handling in moxa_pci_probe GONG, Ruiqi
2022-08-01 9:01 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome