1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 4ae1a4138b47..74b1080d116d 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -2218,12 +2218,13 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance)
                 else
                         handled = mv_host_intr(host, pending_irqs);
         }
-        spin_unlock(&host->lock);
 
         /* for MSI: unmask; interrupt cause bits will retrigger now */
         if (using_msi)
                 writel(hpriv->main_irq_mask, hpriv->main_irq_mask_addr);
 
+        spin_unlock(&host->lock);
+
         return IRQ_RETVAL(handled);
 }
 
@@ -3114,19 +3115,17 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
                 writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS);
         }
 
-        if (!IS_SOC(hpriv)) {
-                /* Clear any currently outstanding host interrupt conditions */
-                writelfl(0, mmio + hpriv->irq_cause_ofs);
+        /* Clear any currently outstanding host interrupt conditions */
+        writelfl(0, mmio + hpriv->irq_cause_ofs);
 
-                /* and unmask interrupt generation for host regs */
-                writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
+        /* and unmask interrupt generation for host regs */
+        writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
 
-                /*
-                 * enable only global host interrupts for now.
-                 * The per-port interrupts get done later as ports are set up.
-                 */
-                mv_set_main_irq_mask(host, 0, PCI_ERR);
-        }
+        /*
+         * enable only global host interrupts for now.
+         * The per-port interrupts get done later as ports are set up.
+         */
+        mv_set_main_irq_mask(host, 0, PCI_ERR);
 done:
         return rc;
 }