diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index bc3febe74d68..60be47f8c4a8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
@@ -125,9 +125,10 @@ EXPORT_SYMBOL(iwl_rx_queue_space); | |||
125 | */ | 125 | */ |
126 | int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv, struct iwl_rx_queue *q) | 126 | int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv, struct iwl_rx_queue *q) |
127 | { | 127 | { |
128 | u32 reg = 0; | ||
129 | int ret = 0; | ||
130 | unsigned long flags; | 128 | unsigned long flags; |
129 | u32 rx_wrt_ptr_reg = priv->hw_params.rx_wrt_ptr_reg; | ||
130 | u32 reg; | ||
131 | int ret = 0; | ||
131 | 132 | ||
132 | spin_lock_irqsave(&q->lock, flags); | 133 | spin_lock_irqsave(&q->lock, flags); |
133 | 134 | ||
@@ -149,15 +150,14 @@ int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv, struct iwl_rx_queue *q) | |||
149 | goto exit_unlock; | 150 | goto exit_unlock; |
150 | 151 | ||
151 | /* Device expects a multiple of 8 */ | 152 | /* Device expects a multiple of 8 */ |
152 | iwl_write_direct32(priv, FH_RSCSR_CHNL0_WPTR, | 153 | iwl_write_direct32(priv, rx_wrt_ptr_reg, q->write & ~0x7); |
153 | q->write & ~0x7); | ||
154 | iwl_release_nic_access(priv); | 154 | iwl_release_nic_access(priv); |
155 | 155 | ||
156 | /* Else device is assumed to be awake */ | 156 | /* Else device is assumed to be awake */ |
157 | } else | 157 | } else { |
158 | /* Device expects a multiple of 8 */ | 158 | /* Device expects a multiple of 8 */ |
159 | iwl_write32(priv, FH_RSCSR_CHNL0_WPTR, q->write & ~0x7); | 159 | iwl_write32(priv, rx_wrt_ptr_reg, q->write & ~0x7); |
160 | 160 | } | |
161 | 161 | ||
162 | q->need_update = 0; | 162 | q->need_update = 0; |
163 | 163 | ||