|
Oliver Neukum |
88c7ed |
From 05c2a61d69ea306e891884a86486e1ef37c4b78d Mon Sep 17 00:00:00 2001
|
|
Oliver Neukum |
88c7ed |
From: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
Oliver Neukum |
88c7ed |
Date: Fri, 4 Dec 2020 16:47:17 +0800
|
|
Oliver Neukum |
88c7ed |
Subject: [PATCH] adm8211: fix error return code in adm8211_probe()
|
|
Oliver Neukum |
88c7ed |
Git-commit: 05c2a61d69ea306e891884a86486e1ef37c4b78d
|
|
Oliver Neukum |
88c7ed |
References: git-fixes
|
|
Oliver Neukum |
88c7ed |
Patch-mainline: v5.11-rc1
|
|
Oliver Neukum |
88c7ed |
|
|
Oliver Neukum |
88c7ed |
Fix to return a negative error code from the error handling
|
|
Oliver Neukum |
88c7ed |
case instead of 0, as done elsewhere in this function.
|
|
Oliver Neukum |
88c7ed |
|
|
Oliver Neukum |
88c7ed |
Fixes: cc0b88cf5ecf ("[PATCH] Add adm8211 802.11b wireless driver")
|
|
Oliver Neukum |
88c7ed |
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
Oliver Neukum |
88c7ed |
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
Oliver Neukum |
88c7ed |
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Oliver Neukum |
88c7ed |
Link: https://lore.kernel.org/r/1607071638-33619-1-git-send-email-zhangchangzhong@huawei.com
|
|
Oliver Neukum |
88c7ed |
Signed-off-by: Oliver Neukum <oneukum@suse.com>
|
|
Oliver Neukum |
88c7ed |
---
|
|
Oliver Neukum |
88c7ed |
drivers/net/wireless/admtek/adm8211.c | 6 ++++--
|
|
Oliver Neukum |
88c7ed |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
Oliver Neukum |
88c7ed |
|
|
Oliver Neukum |
88c7ed |
--- a/drivers/net/wireless/admtek/adm8211.c
|
|
Oliver Neukum |
88c7ed |
+++ b/drivers/net/wireless/admtek/adm8211.c
|
|
Oliver Neukum |
88c7ed |
@@ -1799,6 +1799,7 @@ static int adm8211_probe(struct pci_dev
|
|
Oliver Neukum |
88c7ed |
if (io_len < 256 || mem_len < 1024) {
|
|
Oliver Neukum |
88c7ed |
printk(KERN_ERR "%s (adm8211): Too short PCI resources\n",
|
|
Oliver Neukum |
88c7ed |
pci_name(pdev));
|
|
Oliver Neukum |
88c7ed |
+ err = -ENOMEM;
|
|
Oliver Neukum |
88c7ed |
goto err_disable_pdev;
|
|
Oliver Neukum |
88c7ed |
}
|
|
Oliver Neukum |
88c7ed |
|
|
Oliver Neukum |
88c7ed |
@@ -1808,6 +1809,7 @@ static int adm8211_probe(struct pci_dev
|
|
Oliver Neukum |
88c7ed |
if (reg != ADM8211_SIG1 && reg != ADM8211_SIG2) {
|
|
Oliver Neukum |
88c7ed |
printk(KERN_ERR "%s (adm8211): Invalid signature (0x%x)\n",
|
|
Oliver Neukum |
88c7ed |
pci_name(pdev), reg);
|
|
Oliver Neukum |
88c7ed |
+ err = -EINVAL;
|
|
Oliver Neukum |
88c7ed |
goto err_disable_pdev;
|
|
Oliver Neukum |
88c7ed |
}
|
|
Oliver Neukum |
88c7ed |
|
|
Oliver Neukum |
88c7ed |
@@ -1818,8 +1820,8 @@ static int adm8211_probe(struct pci_dev
|
|
Oliver Neukum |
88c7ed |
return err; /* someone else grabbed it? don't disable it */
|
|
Oliver Neukum |
88c7ed |
}
|
|
Oliver Neukum |
88c7ed |
|
|
Oliver Neukum |
88c7ed |
- if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) ||
|
|
Oliver Neukum |
88c7ed |
- pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
|
|
Oliver Neukum |
88c7ed |
+ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
Oliver Neukum |
88c7ed |
+ if (err) {
|
|
Oliver Neukum |
88c7ed |
printk(KERN_ERR "%s (adm8211): No suitable DMA available\n",
|
|
Oliver Neukum |
88c7ed |
pci_name(pdev));
|
|
Oliver Neukum |
88c7ed |
goto err_free_reg;
|