lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 578/862] mfd: fsl-imx25: Fix check for platform_get_irq() errors
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 75db7907355ca5e2ff606e9dd3e86b6c3a455fe2 ]

    The mx25_tsadc_remove() function assumes all non-zero returns are success
    but the platform_get_irq() function returns negative on error and
    positive non-zero values on success. It never returns zero, but if it
    did then treat that as a success.

    Fixes: 18f773937968 ("mfd: fsl-imx25: Clean up irq settings during removal")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Martin Kaiser <martin@kaiser.cx>
    Signed-off-by: Lee Jones <lee@kernel.org>
    Link: https://lore.kernel.org/r/YvTfkbVQWYKMKS/t@kili
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/fsl-imx25-tsadc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c
    index 85f7982d26d2..823595bcc9b7 100644
    --- a/drivers/mfd/fsl-imx25-tsadc.c
    +++ b/drivers/mfd/fsl-imx25-tsadc.c
    @@ -69,7 +69,7 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev,
    int irq;

    irq = platform_get_irq(pdev, 0);
    - if (irq <= 0)
    + if (irq < 0)
    return irq;

    tsadc->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops,
    @@ -89,7 +89,7 @@ static int mx25_tsadc_unset_irq(struct platform_device *pdev)
    struct mx25_tsadc *tsadc = platform_get_drvdata(pdev);
    int irq = platform_get_irq(pdev, 0);

    - if (irq) {
    + if (irq >= 0) {
    irq_set_chained_handler_and_data(irq, NULL, NULL);
    irq_domain_remove(tsadc->domain);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:36    [W:3.502 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site