From a54cdaa07af405f4786b48f0ab6365a366c9ed71 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 17 Nov 2018 14:54:43 -0500 Subject: [PATCH] idualwifi7260: Fix a different instance of memset(NULL). --- .../drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c index 11094cd6f2..dfd598f478 100644 --- a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c +++ b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c @@ -539,8 +539,7 @@ iwm_fw_info_free(struct iwm_fw_info *fw) firmware_put(fw->fw_fp, FIRMWARE_UNLOAD); fw->fw_fp = NULL; /* 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 @@ -1166,7 +1165,8 @@ iwm_reset_tx_ring(struct iwm_softc *sc, struct iwm_tx_ring *ring) } } /* 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_DMASYNC_PREWRITE); sc->qfullmsk &= ~(1 << ring->qid);