]> git.hungrycats.org Git - linux/commitdiff
rtase: Corrects error handling of the rtase_check_mac_version_valid()
authorJustin Lai <justinlai0215@realtek.com>
Wed, 20 Nov 2024 07:56:24 +0000 (15:56 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 13:02:32 +0000 (14:02 +0100)
[ Upstream commit a01cfcfda5cc787552b344cbc92f9c363c81ad4f ]

Previously, when the hardware version ID was determined to be invalid,
only an error message was printed without any further handling. Therefore,
this patch makes the necessary corrections to address this.

Fixes: a36e9f5cfe9e ("rtase: Add support for a pci table in this module")
Signed-off-by: Justin Lai <justinlai0215@realtek.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/realtek/rtase/rtase_main.c

index 7b433b290a9730e5d2a82f3377520e568256f4ac..1bfe5ef40c522d5f4de277f06b49c9d48ee6448e 100644 (file)
@@ -2122,6 +2122,7 @@ static int rtase_init_one(struct pci_dev *pdev,
                dev_err(&pdev->dev,
                        "unknown chip version: 0x%08x, contact rtase maintainers (see MAINTAINERS file)\n",
                        tp->hw_ver);
+               goto err_out_release_board;
        }
 
        rtase_init_software_variable(pdev, tp);
@@ -2196,6 +2197,7 @@ err_out_1:
                netif_napi_del(&ivec->napi);
        }
 
+err_out_release_board:
        rtase_release_board(pdev, dev, ioaddr);
 
        return ret;