mfd: fsl-imx25: fix check for platform_get_irq() errors

[PATCH] mfd: fsl-imx25: fix check for platform_get_irq() errors

Posted by Dan Carpenter 3 years, 8 months ago

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>
---
 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 37e5e02a1d05..dfc6da9b4aec 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,
@@ -179,7 +179,7 @@ static int mx25_tsadc_remove(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

Re: [PATCH] mfd: fsl-imx25: fix check for platform_get_irq() errors

Posted by Lee Jones 3 years, 7 months ago

On Thu, 11 Aug 2022, Dan Carpenter wrote:

> 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>
> ---
>  drivers/mfd/fsl-imx25-tsadc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]

Re: [PATCH] mfd: fsl-imx25: fix check for platform_get_irq() errors

Posted by Martin Kaiser 3 years, 8 months ago

Thus wrote Dan Carpenter (dan.carpenter@oracle.com):

> 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>
> ---
>  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 37e5e02a1d05..dfc6da9b4aec 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,
> @@ -179,7 +179,7 @@ static int mx25_tsadc_remove(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

Reviewed-by: Martin Kaiser <martin@kaiser.cx>

Thanks,

   Martin