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

idualwifi7260: Fix a different instance of memset(NULL).

Browse Source
This commit is contained in:
Augustin Cavalier
2018-11-17 14:57:50 -05:00
parent 01304f19fd
commit a54cdaa07a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c
+3 -3
View File
@@ -539,8 +539,7 @@ iwm_fw_info_free(struct iwm_fw_info *fw)
firmware_put(fw->fw_fp, FIRMWARE_UNLOAD); firmware_put(fw->fw_fp, FIRMWARE_UNLOAD);
fw->fw_fp = NULL; fw->fw_fp = NULL;
/* don't touch fw->fw_status */ /* don't touch fw->fw_status */
if (fw->fw_sects) memset(fw->fw_sects, 0, sizeof(fw->fw_sects));
memset(fw->fw_sects, 0, sizeof(fw->fw_sects));
} }
static int static int
@@ -1166,7 +1165,8 @@ iwm_reset_tx_ring(struct iwm_softc *sc, struct iwm_tx_ring *ring)
} }
} }
/* Clear TX descriptors. */ /* Clear TX descriptors. */
memset(ring->desc, 0, ring->desc_dma.size); if (ring->desc)
memset(ring->desc, 0, ring->desc_dma.size);
bus_dmamap_sync(ring->desc_dma.tag, ring->desc_dma.map, bus_dmamap_sync(ring->desc_dma.tag, ring->desc_dma.map,
BUS_DMASYNC_PREWRITE); BUS_DMASYNC_PREWRITE);
sc->qfullmsk &= ~(1 << ring->qid); sc->qfullmsk &= ~(1 << ring->qid);