omap: mailbox: call request_irq after mbox queues are allocated
authorSuman Anna <s-anna@ti.com>
Sat, 2 Feb 2013 02:37:06 +0000 (20:37 -0600)
committerSuman Anna <s-anna@ti.com>
Tue, 11 Jun 2013 16:39:21 +0000 (11:39 -0500)
The OMAP mailbox startup code is enabling the interrupt before any
of the associated mailbox queues are allocated. Move this code so
that the interrupt configuration for a mailbox is together.

Signed-off-by: Fernando Guzman Lugo <lugo.fernando@gmail.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
arch/arm/plat-omap/mailbox.c

index 42377ef9ea3d3fb4c5231622b21e4bc6714294ce..f65eaf00fce63d5f7457523a2e92dfa9dbdf746a 100644 (file)
@@ -261,13 +261,6 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
        }
 
        if (!mbox->use_count++) {
-               ret = request_irq(mbox->irq, mbox_interrupt, IRQF_SHARED,
-                                                       mbox->name, mbox);
-               if (unlikely(ret)) {
-                       pr_err("failed to register mailbox interrupt:%d\n",
-                                                                       ret);
-                       goto fail_request_irq;
-               }
                mq = mbox_queue_alloc(mbox, NULL, mbox_tx_tasklet);
                if (!mq) {
                        ret = -ENOMEM;
@@ -282,17 +275,24 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
                }
                mbox->rxq = mq;
                mq->mbox = mbox;
+               ret = request_irq(mbox->irq, mbox_interrupt, IRQF_SHARED,
+                                                       mbox->name, mbox);
+               if (unlikely(ret)) {
+                       pr_err("failed to register mailbox interrupt:%d\n",
+                                                                       ret);
+                       goto fail_request_irq;
+               }
 
                omap_mbox_enable_irq(mbox, IRQ_RX);
        }
        mutex_unlock(&mbox_configured_lock);
        return 0;
 
+fail_request_irq:
+       mbox_queue_free(mbox->rxq);
 fail_alloc_rxq:
        mbox_queue_free(mbox->txq);
 fail_alloc_txq:
-       free_irq(mbox->irq, mbox);
-fail_request_irq:
        if (mbox->ops->shutdown)
                mbox->ops->shutdown(mbox);
        mbox->use_count--;