diff mbox series

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

Message ID 20221110031228.247361-1-xiujianfeng@huawei.com
State New
Headers
Series [v2] wifi: ath10k: Fix return value in ath10k_pci_init() |

Commit Message

Xiu Jianfeng Nov. 10, 2022, 3:12 a.m. UTC 
  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(-)

Comments

Jakub Kicinski Nov. 10, 2022, 3:25 a.m. UTC | #1 
On Thu, 10 Nov 2022 11:12:28 +0800 Xiu Jianfeng wrote:
> To: <kvalo@kernel.org>, <davem@davemloft.net>, <edumazet@google.com>,  <kuba@kernel.org>, <pabeni@redhat.com>, <rmani@qti.qualcomm.com>
> CC: <ath10k@lists.infradead.org>, <linux-wireless@vger.kernel.org>,  <linux-kernel@vger.kernel.org>

How did you come up with this CC list? If you're CCing netdev
maintainers you should also CC netdev@vger.kernel.org 
Somehow you managed to CC LMKL but not netdev :S
Xiu Jianfeng Nov. 10, 2022, 4 a.m. UTC | #2 
在 2022/11/10 11:25, Jakub Kicinski 写道:
> On Thu, 10 Nov 2022 11:12:28 +0800 Xiu Jianfeng wrote:
>> To: <kvalo@kernel.org>, <davem@davemloft.net>, <edumazet@google.com>,  <kuba@kernel.org>, <pabeni@redhat.com>, <rmani@qti.qualcomm.com>
>> CC: <ath10k@lists.infradead.org>, <linux-wireless@vger.kernel.org>,  <linux-kernel@vger.kernel.org>
> 
> How did you come up with this CC list? If you're CCing netdev
> maintainers you should also CC netdev@vger.kernel.org
> Somehow you managed to CC LMKL but not netdev :S
> .

Sorry, I may missed that, I will resend this patch.
>
diff mbox series

Patch

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