lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: ath10k: Fix return value in ath10k_pci_init()

Browse Source 
[ Upstream commit 2af7749047d8d6ad43feff69f555a13a6a6c2831 ]

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: 0b523ced9a ("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>
Link: https://lore.kernel.org/r/20221110061926.18163-1-xiujianfeng@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Xiu Jianfeng 2022-11-10 14:19:26 +08:00 committed by Greg Kroah-Hartman
parent 8176538866
commit 8e51f5894d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/wireless/ath/ath10k/pci.c
View File

@ -3769,18 +3769,22 @@ static struct pci_driver ath10k_pci_driver = {
static int __init ath10k_pci_init(void) static int __init ath10k_pci_init(void)
{ {
int ret; int ret1, ret2;
ret = pci_register_driver(&ath10k_pci_driver); ret1 = pci_register_driver(&ath10k_pci_driver);
if (ret) if (ret1)
printk(KERN_ERR "failed to register ath10k pci driver: %d\n", printk(KERN_ERR "failed to register ath10k pci driver: %d\n",
ret); ret1);
ret = ath10k_ahb_init(); ret2 = ath10k_ahb_init();
if (ret) if (ret2)
printk(KERN_ERR "ahb init failed: %d\n", ret); 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); module_init(ath10k_pci_init);