From 75db7907355ca5e2ff606e9dd3e86b6c3a455fe2 Mon Sep 17 00:00:00 2001

From: Dan Carpenter <dan.carpenter@oracle.com>

Date: Thu, 11 Aug 2022 13:53:05 +0300

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

Git-commit: 75db7907355ca5e2ff606e9dd3e86b6c3a455fe2

Patch-mainline: v6.1-rc1

References: git-fixes

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

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 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.3