Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "GONG, Ruiqi" <gongruiqi1@huawei.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jirislaby@kernel.org>
CC:     <linux-kernel@vger.kernel.org>, <wangweiyang2@huawei.com>,
        <gongruiqi1@huawei.com>
Subject: [PATCH] tty: moxa: Refine error handling in moxa_pci_probe
Date:   Mon, 1 Aug 2022 16:53:56 +0800
Message-ID: <20220801085356.1716756-1-gongruiqi1@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7BIT
Content-Type:   text/plain; charset=US-ASCII
Precedence: bulk

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