mmc: wbsd: initialize tasklets before requesting interrupt

With CONFIG_DEBUG_SHIRQ set we will get an interrupt as soon as we
allocate one.  Tasklets may be scheduled in the interrupt handler but they
will be initialized after the handler returns, causing a BUG() in
kernel/softirq.c when they run.

Should fix this Fedora bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=449817

Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index be624a049c67..c303e7f57ab4 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1457,17 +1457,7 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)
         int ret;
 
         /*
-         * Allocate interrupt.
-         */
-
-        ret = request_irq(irq, wbsd_irq, IRQF_SHARED, DRIVER_NAME, host);
-        if (ret)
-                return ret;
-
-        host->irq = irq;
-
-        /*
-         * Set up tasklets.
+         * Set up tasklets. Must be done before requesting interrupt.
          */
         tasklet_init(&host->card_tasklet, wbsd_tasklet_card,
                         (unsigned long)host);
@@ -1480,6 +1470,15 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)
         tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish,
                         (unsigned long)host);
 
+        /*
+         * Allocate interrupt.
+         */
+        ret = request_irq(irq, wbsd_irq, IRQF_SHARED, DRIVER_NAME, host);
+        if (ret)
+                return ret;
+
+        host->irq = irq;
+
         return 0;
 }