From 2e1033fcf1206b57b16f2a0ed26915205d3ea5ab Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 20 Jun 2022 13:04:00 -0400 Subject: [PATCH] idualwifi7260 & iaxwifi200: preinit() can fail. This will prevent the device from even appearing in Network preferences if firmware loading does not work. --- .../kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c | 3 ++- .../kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c index 422c52420d..fa000b358b 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c +++ b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c @@ -11028,7 +11028,8 @@ iwx_attach(struct device *parent, struct device *self, void *aux) ic->ic_ampdu_tx_stop = NULL; #ifdef __HAIKU__ - iwx_preinit(sc); + if (iwx_preinit(sc) != 0) + return -1; #else /* * We cannot read the MAC address without loading the diff --git a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c index 5ed22bb370..c921580f1c 100644 --- a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c +++ b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c @@ -12124,7 +12124,8 @@ iwm_attach(struct device *parent, struct device *self, void *aux) ic->ic_ampdu_tx_start = iwm_ampdu_tx_start; ic->ic_ampdu_tx_stop = iwm_ampdu_tx_stop; #ifdef __HAIKU__ - iwm_preinit(sc); + if (iwm_preinit(sc) != 0) + return -1; #else /* * We cannot read the MAC address without loading the