aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2012-04-16 19:16:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-01 03:13:00 -0400
commit0d7755e450865b76b98e3fea2e166b0a2266972d (patch)
treef8cd534b07f01aaf1e990ab3ca336c1f75adb46c /include/linux
parent1c4f53ca32463a742583976f40444ce4485f3cf9 (diff)
mmc: sdio: avoid spurious calls to interrupt handlers
commit bbbc4c4d8c5face097d695f9bf3a39647ba6b7e7 upstream. Commit 06e8935feb ("optimized SDIO IRQ handling for single irq") introduced some spurious calls to SDIO function interrupt handlers, such as when the SDIO IRQ thread is started, or the safety check performed upon a system resume. Let's add a flag to perform the optimization only when a real interrupt is signaled by the host driver and we know there is no point confirming it. Reported-by: Sujit Reddy Thumma <sthumma@codeaurora.org> Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mmc/host.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 1ee4424462e..f8d1e741d80 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -267,6 +267,7 @@ struct mmc_host {
267 267
268 unsigned int sdio_irqs; 268 unsigned int sdio_irqs;
269 struct task_struct *sdio_irq_thread; 269 struct task_struct *sdio_irq_thread;
270 bool sdio_irq_pending;
270 atomic_t sdio_irq_thread_abort; 271 atomic_t sdio_irq_thread_abort;
271 272
272 mmc_pm_flag_t pm_flags; /* requested pm features */ 273 mmc_pm_flag_t pm_flags; /* requested pm features */
@@ -312,6 +313,7 @@ extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
312static inline void mmc_signal_sdio_irq(struct mmc_host *host) 313static inline void mmc_signal_sdio_irq(struct mmc_host *host)
313{ 314{
314 host->ops->enable_sdio_irq(host, 0); 315 host->ops->enable_sdio_irq(host, 0);
316 host->sdio_irq_pending = true;
315 wake_up_process(host->sdio_irq_thread); 317 wake_up_process(host->sdio_irq_thread);
316} 318}
317 319