Merge branch 'for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...

[linux-2.6-microblaze.git] / drivers / mailbox / mtk-cmdq-mailbox.c

diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index 484d443..5665b6e 100644 (file)
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -69,7 +69,7 @@ struct cmdq_task {
 struct cmdq {
        struct mbox_controller  mbox;
        void __iomem            *base;
-       u32                     irq;
+       int                     irq;
        u32                     thread_nr;
        u32                     irq_mask;
        struct cmdq_thread      *thread;
@@ -525,10 +525,8 @@ static int cmdq_probe(struct platform_device *pdev)
        }
 
        cmdq->irq = platform_get_irq(pdev, 0);
-       if (!cmdq->irq) {
-               dev_err(dev, "failed to get irq\n");
-               return -EINVAL;
-       }
+       if (cmdq->irq < 0)
+               return cmdq->irq;
 
        plat_data = (struct gce_plat *)of_device_get_match_data(dev);
        if (!plat_data) {