i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iaxwifi200: Add missing if_free_inplace on deinit.

Browse Source 
It may make sense to place this later so that we don't need to add
another goto label, but that can be experimented with later.
This commit is contained in:
Augustin Cavalier
2022-06-20 17:14:53 -04:00
parent 891bd14810
commit 22bdb7ba70
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c
+11 -7
View File
@@ -10664,7 +10664,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
if (err == 0) { if (err == 0) {
printf("%s: PCIe capability structure not found!\n", printf("%s: PCIe capability structure not found!\n",
DEVNAME(sc)); DEVNAME(sc));
return -1; goto fail;
} }
/* /*
@@ -10679,7 +10679,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
&sc->sc_st, &sc->sc_sh, NULL, &sc->sc_sz, 0); &sc->sc_st, &sc->sc_sh, NULL, &sc->sc_sz, 0);
if (err) { if (err) {
printf("%s: can't map mem space\n", DEVNAME(sc)); printf("%s: can't map mem space\n", DEVNAME(sc));
return -1; goto fail;
} }
if (pci_intr_map_msix(pa, 0, &ih) == 0) { if (pci_intr_map_msix(pa, 0, &ih) == 0) {
@@ -10691,7 +10691,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
{ {
#endif #endif
printf("%s: can't map interrupt\n", DEVNAME(sc)); printf("%s: can't map interrupt\n", DEVNAME(sc));
return -1; goto fail;
} }
/* Hardware bug workaround. */ /* Hardware bug workaround. */
reg = pci_conf_read(sc->sc_pct, sc->sc_pcitag, reg = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
@@ -10716,7 +10716,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
if (intrstr != NULL) if (intrstr != NULL)
printf(" at %s", intrstr); printf(" at %s", intrstr);
printf("\n"); printf("\n");
return -1; goto fail;
} }
printf(", %s\n", intrstr); printf(", %s\n", intrstr);
@@ -10757,7 +10757,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
/* These devices should be QuZ only. */ /* These devices should be QuZ only. */
if (sc->sc_hw_rev != IWX_CSR_HW_REV_TYPE_QUZ) { if (sc->sc_hw_rev != IWX_CSR_HW_REV_TYPE_QUZ) {
printf("%s: unsupported AX201 adapter\n", DEVNAME(sc)); printf("%s: unsupported AX201 adapter\n", DEVNAME(sc));
return -1; goto fail;
} }
sc->sc_fwname = IWX_QUZ_A_HR_B_FW; sc->sc_fwname = IWX_QUZ_A_HR_B_FW;
sc->sc_device_family = IWX_DEVICE_FAMILY_22000; sc->sc_device_family = IWX_DEVICE_FAMILY_22000;
@@ -10835,7 +10835,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
break; break;
default: default:
printf("%s: unknown adapter type\n", DEVNAME(sc)); printf("%s: unknown adapter type\n", DEVNAME(sc));
return -1; goto fail;
} }
#ifdef __FreeBSD_version #ifdef __FreeBSD_version
#undef PCI_PRODUCT #undef PCI_PRODUCT
@@ -10871,7 +10871,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
if (err) { if (err) {
printf("%s: could not allocate memory for loading firmware\n", printf("%s: could not allocate memory for loading firmware\n",
DEVNAME(sc)); DEVNAME(sc));
return -1; goto fail;
} }
if (sc->sc_device_family >= IWX_DEVICE_FAMILY_AX210) { if (sc->sc_device_family >= IWX_DEVICE_FAMILY_AX210) {
@@ -11049,6 +11049,10 @@ fail4: while (--txq_i >= 0)
fail1: iwx_dma_contig_free(&sc->ctxt_info_dma); fail1: iwx_dma_contig_free(&sc->ctxt_info_dma);
iwx_dma_contig_free(&sc->prph_scratch_dma); iwx_dma_contig_free(&sc->prph_scratch_dma);
iwx_dma_contig_free(&sc->prph_info_dma); iwx_dma_contig_free(&sc->prph_info_dma);
#ifdef __HAIKU__
fail:
if_free_inplace(ifp);
#endif
return -1; return -1;
} }