1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 2f219ce61392..b7e9238aaec4 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1290,19 +1290,11 @@ static inline void falcon_interrupts(struct efx_nic *efx, int enabled,
 
 void falcon_enable_interrupts(struct efx_nic *efx)
 {
-        efx_oword_t int_adr_reg_ker;
         struct efx_channel *channel;
 
         EFX_ZERO_OWORD(*((efx_oword_t *) efx->irq_status.addr));
         wmb(); /* Ensure interrupt vector is clear before interrupts enabled */
 
-        /* Program address */
-        EFX_POPULATE_OWORD_2(int_adr_reg_ker,
-                             FRF_AZ_NORM_INT_VEC_DIS_KER,
-                             EFX_INT_MODE_USE_MSI(efx),
-                             FRF_AZ_INT_ADR_KER, efx->irq_status.dma_addr);
-        efx_writeo(efx, &int_adr_reg_ker, FR_AZ_INT_ADR_KER);
-
         /* Enable interrupts */
         falcon_interrupts(efx, 1, 0);
 
@@ -3061,6 +3053,13 @@ int falcon_init_nic(struct efx_nic *efx)
         EFX_POPULATE_OWORD_1(temp, FRF_AZ_RX_DC_PF_LWM, RX_DC_ENTRIES - 8);
         efx_writeo(efx, &temp, FR_AZ_RX_DC_PF_WM);
 
+        /* Program INT_KER address */
+        EFX_POPULATE_OWORD_2(temp,
+                             FRF_AZ_NORM_INT_VEC_DIS_KER,
+                             EFX_INT_MODE_USE_MSI(efx),
+                             FRF_AZ_INT_ADR_KER, efx->irq_status.dma_addr);
+        efx_writeo(efx, &temp, FR_AZ_INT_ADR_KER);
+
         /* Clear the parity enables on the TX data fifos as
          * they produce false parity errors because of timing issues
          */