diff mbox series

net: ath10: add missing ret initialization

Message ID 20210623191426.13648-1-paskripkin@gmail.com (mailing list archive)
State Superseded
Delegated to: Kalle Valo
Headers show
Series net: ath10: add missing ret initialization | expand

Commit Message

Pavel Skripkin June 23, 2021, 7:14 p.m. UTC
In case of not supported chip the code jump
to the error handling path, but _ret_ will be set to 0.
Returning 0 from probe means, that ->probe() succeeded, but
it's not true when chip is not supported.

Fixes: f8914a14623a ("ath10k: restore QCA9880-AR1A (v1) detection")
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
---
 drivers/net/wireless/ath/ath10k/pci.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Christian Lamparter June 23, 2021, 7:23 p.m. UTC | #1
On 23/06/2021 21:14, Pavel Skripkin wrote:
> In case of not supported chip the code jump
> to the error handling path, but _ret_ will be set to 0.
> Returning 0 from probe means, that ->probe() succeeded, but
> it's not true when chip is not supported.
> 
> Fixes: f8914a14623a ("ath10k: restore QCA9880-AR1A (v1) detection")
> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>

I think this is already fixed by:

commit e2783e2f39ba99178dedfc1646d5cc0979d1bab3
Author: Yang Yingliang <yangyingliang@huawei.com>
Date:   Mon May 31 17:41:28 2021 +0300

     ath10k: add missing error return code in ath10k_pci_probe()


Cheers
Christian
Pavel Skripkin June 23, 2021, 7:26 p.m. UTC | #2
On Wed, 23 Jun 2021 21:23:27 +0200
Christian Lamparter <chunkeey@gmail.com> wrote:

> On 23/06/2021 21:14, Pavel Skripkin wrote:
> > In case of not supported chip the code jump
> > to the error handling path, but _ret_ will be set to 0.
> > Returning 0 from probe means, that ->probe() succeeded, but
> > it's not true when chip is not supported.
> > 
> > Fixes: f8914a14623a ("ath10k: restore QCA9880-AR1A (v1) detection")
> > Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
> 
> I think this is already fixed by:
> 
> commit e2783e2f39ba99178dedfc1646d5cc0979d1bab3
> Author: Yang Yingliang <yangyingliang@huawei.com>
> Date:   Mon May 31 17:41:28 2021 +0300
> 
>      ath10k: add missing error return code in ath10k_pci_probe()
> 
> 

Ah, i didn't check linux-next tree, my bad :(

Thanks for pointing it out



With regards,
Pavel Skripkin
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index e7fde635e0ee..36ea8debd1c7 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -3697,11 +3697,15 @@  static int ath10k_pci_probe(struct pci_dev *pdev,
 	}
 
 	bus_params.chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);
-	if (bus_params.chip_id == 0xffffffff)
+	if (bus_params.chip_id == 0xffffffff) {
+		ret = -ENODEV;
 		goto err_unsupported;
+	}
 
-	if (!ath10k_pci_chip_is_supported(pdev->device, bus_params.chip_id))
+	if (!ath10k_pci_chip_is_supported(pdev->device, bus_params.chip_id)) {
+		ret = -ENODEV;
 		goto err_free_irq;
+	}
 
 	ret = ath10k_core_register(ar, &bus_params);
 	if (ret) {