Skip to content
Snippets Groups Projects
Commit ac774812 authored by Justin Lai's avatar Justin Lai Committed by Greg Kroah-Hartman
Browse files

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: a36e9f5c ("rtase: Add support for a pci table in this module")
Signed-off-by: default avatarJustin Lai <justinlai0215@realtek.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a0e3a09b
No related branches found
No related tags found
1 merge request!176🤖 Sync Bot: Update v6.12-ktn to Latest Stable Kernel (v6.12.4)
...@@ -2122,6 +2122,7 @@ static int rtase_init_one(struct pci_dev *pdev, ...@@ -2122,6 +2122,7 @@ static int rtase_init_one(struct pci_dev *pdev,
dev_err(&pdev->dev, dev_err(&pdev->dev,
"unknown chip version: 0x%08x, contact rtase maintainers (see MAINTAINERS file)\n", "unknown chip version: 0x%08x, contact rtase maintainers (see MAINTAINERS file)\n",
tp->hw_ver); tp->hw_ver);
goto err_out_release_board;
} }
rtase_init_software_variable(pdev, tp); rtase_init_software_variable(pdev, tp);
...@@ -2196,6 +2197,7 @@ static int rtase_init_one(struct pci_dev *pdev, ...@@ -2196,6 +2197,7 @@ static int rtase_init_one(struct pci_dev *pdev,
netif_napi_del(&ivec->napi); netif_napi_del(&ivec->napi);
} }
err_out_release_board:
rtase_release_board(pdev, dev, ioaddr); rtase_release_board(pdev, dev, ioaddr);
return ret; return ret;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment