remoteproc: qcom: q6v5: Propagate EPROBE_DEFER

commit d5269c4553a64b6882f2c019ae21b783a0984a83 upstream.

In the case that the interrupts fail to result because of the
interrupt-controller not yet being registered the
platform_get_irq_byname() call will fail with -EPROBE_DEFER, but passing
this into devm_request_threaded_irq() will result in -EINVAL being
returned, the driver is therefor not reprobed later.

Fixes: 3b415c8fb263 ("remoteproc: q6v5: Extract common resource handling")
Cc: stable@vger.kernel.org
Reviewed-by: Sibi Sankar <sibis@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
index 61a760e..e9ab90c 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5.c
+++ b/drivers/remoteproc/qcom_q6v5.c
@@ -198,6 +198,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
        }
 
        q6v5->fatal_irq = platform_get_irq_byname(pdev, "fatal");
+       if (q6v5->fatal_irq == -EPROBE_DEFER)
+               return -EPROBE_DEFER;
+
        ret = devm_request_threaded_irq(&pdev->dev, q6v5->fatal_irq,
                                        NULL, q6v5_fatal_interrupt,
                                        IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@@ -208,6 +211,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
        }
 
        q6v5->ready_irq = platform_get_irq_byname(pdev, "ready");
+       if (q6v5->ready_irq == -EPROBE_DEFER)
+               return -EPROBE_DEFER;
+
        ret = devm_request_threaded_irq(&pdev->dev, q6v5->ready_irq,
                                        NULL, q6v5_ready_interrupt,
                                        IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@@ -218,6 +224,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
        }
 
        q6v5->handover_irq = platform_get_irq_byname(pdev, "handover");
+       if (q6v5->handover_irq == -EPROBE_DEFER)
+               return -EPROBE_DEFER;
+
        ret = devm_request_threaded_irq(&pdev->dev, q6v5->handover_irq,
                                        NULL, q6v5_handover_interrupt,
                                        IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@@ -229,6 +238,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
        disable_irq(q6v5->handover_irq);
 
        q6v5->stop_irq = platform_get_irq_byname(pdev, "stop-ack");
+       if (q6v5->stop_irq == -EPROBE_DEFER)
+               return -EPROBE_DEFER;
+
        ret = devm_request_threaded_irq(&pdev->dev, q6v5->stop_irq,
                                        NULL, q6v5_stop_interrupt,
                                        IRQF_TRIGGER_RISING | IRQF_ONESHOT,