[PATCH RESEND v2] wifi: ath10k: Fix return value in ath10k_pci_init()

[PATCH RESEND v2] wifi: ath10k: Fix return value in ath10k_pci_init()

[Xiu Jianfeng]

This driver is attempting to register to support two different buses.
if either of these is successful then ath10k_pci_init() should return 0
so that hardware attached to the successful bus can be probed and
supported. only if both of these are unsuccessful should ath10k_pci_init()
return an errno.

Fixes: 0b523ced9a3c ("ath10k: add basic skeleton to support ahb")
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>

---
v2: modify according to Jeff's suggestion, and change the commit message
    and body as well.
---
 drivers/net/wireless/ath/ath10k/pci.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index e56c6a6b1379..728d607289c3 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -3792,18 +3792,22 @@ static struct pci_driver ath10k_pci_driver = {
 
 static int __init ath10k_pci_init(void)
 {
-	int ret;
+	int ret1, ret2;
 
-	ret = pci_register_driver(&ath10k_pci_driver);
-	if (ret)
+	ret1 = pci_register_driver(&ath10k_pci_driver);
+	if (ret1)
 		printk(KERN_ERR "failed to register ath10k pci driver: %d\n",
-		       ret);
+		       ret1);
 
-	ret = ath10k_ahb_init();
-	if (ret)
-		printk(KERN_ERR "ahb init failed: %d\n", ret);
+	ret2 = ath10k_ahb_init();
+	if (ret2)
+		printk(KERN_ERR "ahb init failed: %d\n", ret2);
 
-	return ret;
+	if (ret1 && ret2)
+		return ret1;
+
+	/* registered to at least one bus */
+	return 0;
 }
 module_init(ath10k_pci_init);
 
-- 
2.17.1

Re: [PATCH RESEND v2] wifi: ath10k: Fix return value in ath10k_pci_init()

[Jeff Johnson]

On 11/9/2022 10:19 PM, Xiu Jianfeng wrote:
> This driver is attempting to register to support two different buses.
> if either of these is successful then ath10k_pci_init() should return 0
> so that hardware attached to the successful bus can be probed and
> supported. only if both of these are unsuccessful should ath10k_pci_init()
> return an errno.
> 
> Fixes: 0b523ced9a3c ("ath10k: add basic skeleton to support ahb")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>

Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>

Re: [PATCH RESEND v2] wifi: ath10k: Fix return value in ath10k_pci_init()

[Kalle Valo]

Xiu Jianfeng <xiujianfeng@huawei.com> wrote:

> This driver is attempting to register to support two different buses.
> if either of these is successful then ath10k_pci_init() should return 0
> so that hardware attached to the successful bus can be probed and
> supported. only if both of these are unsuccessful should ath10k_pci_init()
> return an errno.
> 
> Fixes: 0b523ced9a3c ("ath10k: add basic skeleton to support ahb")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

Patch applied to ath-next branch of ath.git, thanks.

2af7749047d8 wifi: ath10k: Fix return value in ath10k_pci_init()

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20221110061926.18163-1-xiujianfeng@huawei.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches