Commit ecf305cf authored by Suman Anna's avatar Suman Anna
Browse files

omap: mailbox: call request_irq after mbox queues are allocated 



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: default avatarFernando Guzman Lugo <lugo.fernando@gmail.com>
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
parent a41677c6

arch/arm/plat-omap/mailbox.c

+9 −9
Original line number Diff line number Diff line
@@ -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--;

CRA Git | Maintained and supported by SUSTech CRA and CCSE