summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lai <justinlai0215@realtek.com>2024-11-20 15:56:24 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-12-05 14:02:32 +0100
commitac774812a9625c835d30b0711d1fc3c7bbb61abb (patch)
tree17760fd4c8900f9a95067858b572341193694292
parenta0e3a09bcc3695484c1ed6ae2851bfe9f20d5561 (diff)
rtase: Corrects error handling of the rtase_check_mac_version_valid()
[ 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>
-rw-r--r--drivers/net/ethernet/realtek/rtase/rtase_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index 7b433b290a97..1bfe5ef40c52 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -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;