lkml.org 
[lkml]   [2022]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] tty: moxa: Refine error handling in moxa_pci_probe
Date
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
\
 
 \ /
  Last update: 2022-08-01 10:53    [W:0.031 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site