* [PATCH wireless] adm8211: fix error return code in adm8211_probe()
@ 2020-12-04 8:47 Zhang Changzhong
2020-12-07 16:36 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Zhang Changzhong @ 2020-12-04 8:47 UTC (permalink / raw)
To: Kalle Valo, David S. Miller, Jakub Kicinski, John W. Linville,
Michael Wu
Cc: Zhang Changzhong, linux-wireless, netdev, linux-kernel
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: cc0b88cf5ecf ("[PATCH] Add adm8211 802.11b wireless driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
drivers/net/wireless/admtek/adm8211.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/admtek/adm8211.c b/drivers/net/wireless/admtek/adm8211.c
index 5cf2045..c41e725 100644
--- a/drivers/net/wireless/admtek/adm8211.c
+++ b/drivers/net/wireless/admtek/adm8211.c
@@ -1796,6 +1796,7 @@ static int adm8211_probe(struct pci_dev *pdev,
if (io_len < 256 || mem_len < 1024) {
printk(KERN_ERR "%s (adm8211): Too short PCI resources\n",
pci_name(pdev));
+ err = -ENOMEM;
goto err_disable_pdev;
}
@@ -1805,6 +1806,7 @@ static int adm8211_probe(struct pci_dev *pdev,
if (reg != ADM8211_SIG1 && reg != ADM8211_SIG2) {
printk(KERN_ERR "%s (adm8211): Invalid signature (0x%x)\n",
pci_name(pdev), reg);
+ err = -EINVAL;
goto err_disable_pdev;
}
@@ -1815,8 +1817,8 @@ static int adm8211_probe(struct pci_dev *pdev,
return err; /* someone else grabbed it? don't disable it */
}
- if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)) ||
- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) {
+ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (err) {
printk(KERN_ERR "%s (adm8211): No suitable DMA available\n",
pci_name(pdev));
goto err_free_reg;
--
2.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH wireless] adm8211: fix error return code in adm8211_probe()
2020-12-04 8:47 [PATCH wireless] adm8211: fix error return code in adm8211_probe() Zhang Changzhong
@ 2020-12-07 16:36 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2020-12-07 16:36 UTC (permalink / raw)
To: Zhang Changzhong
Cc: David S. Miller, Jakub Kicinski, John W. Linville, Michael Wu,
Zhang Changzhong, linux-wireless, netdev, linux-kernel
Zhang Changzhong <zhangchangzhong@huawei.com> wrote:
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: cc0b88cf5ecf ("[PATCH] Add adm8211 802.11b wireless driver")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Patch applied to wireless-drivers-next.git, thanks.
05c2a61d69ea adm8211: fix error return code in adm8211_probe()
--
https://patchwork.kernel.org/project/linux-wireless/patch/1607071638-33619-1-git-send-email-zhangchangzhong@huawei.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-07 16:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-04 8:47 [PATCH wireless] adm8211: fix error return code in adm8211_probe() Zhang Changzhong
2020-12-07 16:36 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).