Merge tag 'v3.6-rc6' into spi-mxs

Linux 3.6-rc6

Conflicts (overlap between moving code that accesses registers around
and factoring the register access out into a SSP layer):
	drivers/mmc/host/mxs-mmc.c

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 4da99665477..bb4c2bf04d0 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -197,11 +197,11 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
         writel(stat & MXS_MMC_IRQ_BITS,
                ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
 
+        spin_unlock(&host->lock);
+
         if ((stat & BM_SSP_CTRL1_SDIO_IRQ) && (stat & BM_SSP_CTRL1_SDIO_IRQ_EN))
                 mmc_signal_sdio_irq(host->mmc);
 
-        spin_unlock(&host->lock);
-
         if (stat & BM_SSP_CTRL1_RESP_TIMEOUT_IRQ)
                 cmd->error = -ETIMEDOUT;
         else if (stat & BM_SSP_CTRL1_RESP_ERR_IRQ)
@@ -525,12 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
                 writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
                        ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
                 writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
-                       ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
-
-                if (readl(ssp->base + HW_SSP_STATUS(ssp)) &
-                                BM_SSP_STATUS_SDIO_IRQ)
-                        mmc_signal_sdio_irq(host->mmc);
-
+                       host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
         } else {
                 writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
                        ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
@@ -539,6 +534,11 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
         }
 
         spin_unlock_irqrestore(&host->lock, flags);
+
+        if (enable && readl(ssp->base + HW_SSP_STATUS(ssp)) &
+                        BM_SSP_STATUS_SDIO_IRQ)
+                mmc_signal_sdio_irq(host->mmc);
+
 }
 
 static const struct mmc_host_ops mxs_mmc_ops = {