lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 410/633] maiblox: mediatek: Fix handling of platform_get_irq() error
    Date
    From: Krzysztof Kozlowski <krzk@kernel.org>

    [ Upstream commit 558e4c36ec9f2722af4fe8ef84dc812bcdb5c43a ]

    platform_get_irq() returns -ERRNO on error. In such case casting to u32
    and comparing to 0 would pass the check.

    Fixes: 623a6143a845 ("mailbox: mediatek: Add Mediatek CMDQ driver")
    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mailbox/mtk-cmdq-mailbox.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
    index b24822ad8409c..9963bb9cd74fa 100644
    --- 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;
    @@ -466,10 +466,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;

    cmdq->thread_nr = (u32)(unsigned long)of_device_get_match_data(dev);
    cmdq->irq_mask = GENMASK(cmdq->thread_nr - 1, 0);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:09    [W:4.605 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site