diff options
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/rx.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 2 | 
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c index 02c9016d968..ea9e9915ad3 100644 --- a/drivers/net/wireless/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/iwlwifi/pcie/rx.c @@ -436,7 +436,7 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans)  err_rb_stts:  	dma_free_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,  			  rxq->bd, rxq->bd_dma); -	memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma)); +	rxq->bd_dma = 0;  	rxq->bd = NULL;  err_bd:  	return -ENOMEM; @@ -553,7 +553,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)  	dma_free_coherent(trans->dev, sizeof(__le32) * RX_QUEUE_SIZE,  			  rxq->bd, rxq->bd_dma); -	memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma)); +	rxq->bd_dma = 0;  	rxq->bd = NULL;  	if (rxq->rb_stts) @@ -562,7 +562,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)  				  rxq->rb_stts, rxq->rb_stts_dma);  	else  		IWL_DEBUG_INFO(trans, "Free rxq->rb_stts which is NULL\n"); -	memset(&rxq->rb_stts_dma, 0, sizeof(rxq->rb_stts_dma)); +	rxq->rb_stts_dma = 0;  	rxq->rb_stts = NULL;  } diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index d25fc8aaccc..3ff3e8b72fb 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c @@ -615,7 +615,7 @@ static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id)  	if (txq->q.n_bd) {  		dma_free_coherent(dev, sizeof(struct iwl_tfd) *  				  txq->q.n_bd, txq->tfds, txq->q.dma_addr); -		memset(&txq->q.dma_addr, 0, sizeof(txq->q.dma_addr)); +		txq->q.dma_addr = 0;  	}  	kfree(txq->entries);  | 
