firmware: imx: scu-irq: Init workqueue before request mbox channel

With mailbox channel requested, there is possibility that interrupts may
come in, so need to make sure the workqueue is initialized before
the queue is scheduled by mailbox rx callback.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/drivers/firmware/imx/imx-scu-irq.c b/drivers/firmware/imx/imx-scu-irq.c
index d6fd04404e2a3113a6d22b1a580e6c0ac48f5975..2d7237188932632ffd4960796c7e73b69ceac7d5 100644 (file)
--- a/drivers/firmware/imx/imx-scu-irq.c
+++ b/drivers/firmware/imx/imx-scu-irq.c
@@ -214,6 +214,8 @@ int imx_scu_enable_general_irq_channel(struct device *dev)
        cl->dev = dev;
        cl->rx_callback = imx_scu_irq_callback;
 
+       INIT_WORK(&imx_sc_irq_work, imx_scu_irq_work_handler);
+
        /* SCU general IRQ uses general interrupt channel 3 */
        ch = mbox_request_channel_byname(cl, "gip3");
        if (IS_ERR(ch)) {
@@ -222,8 +224,6 @@ int imx_scu_enable_general_irq_channel(struct device *dev)
                goto free_cl;
        }
 
-       INIT_WORK(&imx_sc_irq_work, imx_scu_irq_work_handler);
-
        if (!of_parse_phandle_with_args(dev->of_node, "mboxes",
                                       "#mbox-cells", 0, &spec)) {
                i = of_alias_get_id(spec.np, "mu");