Merge commit 'v3.3-rc4'

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c
index 68f81b9ee0fb..f573e7f9f740 100644
--- a/drivers/mmc/core/sdio_irq.c
+++ b/drivers/mmc/core/sdio_irq.c
@@ -146,15 +146,21 @@ static int sdio_irq_thread(void *_host)
                 }
 
                 set_current_state(TASK_INTERRUPTIBLE);
-                if (host->caps & MMC_CAP_SDIO_IRQ)
+                if (host->caps & MMC_CAP_SDIO_IRQ) {
+                        mmc_host_clk_hold(host);
                         host->ops->enable_sdio_irq(host, 1);
+                        mmc_host_clk_release(host);
+                }
                 if (!kthread_should_stop())
                         schedule_timeout(period);
                 set_current_state(TASK_RUNNING);
         } while (!kthread_should_stop());
 
-        if (host->caps & MMC_CAP_SDIO_IRQ)
+        if (host->caps & MMC_CAP_SDIO_IRQ) {
+                mmc_host_clk_hold(host);
                 host->ops->enable_sdio_irq(host, 0);
+                mmc_host_clk_release(host);
+        }
 
         pr_debug("%s: IRQ thread exiting with code %d\n",
                  mmc_hostname(host), ret);