Skip to contentSkip to conversation

net: ath10: add missing ret initialization

PATCH In review Pavel Skripkin 2 participants 3 messages Jun 23, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ath10: add missing ret initialization

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")
---
 drivers/net/wireless/ath/ath10k/pci.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +6 -2
index e7fde635e0ee..36ea8debd1c7 100644
@@ -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) {
Signature · 6 lines
2.32.0

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
#1 lore raw
Quoted 7 lines · Pavel Skripkin

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")

I think this is already fixed by:

commit e2783e2f39ba99178dedfc1646d5cc0979d1bab3

Author: Yang Yingliang <[email protected]>
Date:   Mon May 31 17:41:28 2021 +0300

ath10k: add missing error return code in ath10k_pci_probe()

Cheers
Christian
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#2 lore raw
Quoted 9 lines · On Wed, 23 Jun 2021 21:23:27 +0200 Christian Lamparter <[email protected]>…
Quoted 7 lines · Pavel Skripkin

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")
Quoted 9 lines

I think this is already fixed by:

commit e2783e2f39ba99178dedfc1646d5cc0979d1bab3

Author: Yang Yingliang <[email protected]>
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