Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Peng Wu <wupeng58@huawei.com>
To:     <lee@kernel.org>, <linus.walleij@linaro.org>
CC:     <linux-kernel@vger.kernel.org>, <liwei391@huawei.com>,
        <wupeng58@huawei.com>
Subject: [PATCH] mfd: htc-i2cpld: Fix an IS_ERR() vs NULL bug in htcpld_core_probe
Date:   Tue, 13 Sep 2022 07:16:59 +0000
Message-ID: <20220913071659.94677-1-wupeng58@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

The gpiochip_request_own_desc() function returns error pointers on error,
it doesn't return NULL.

Fixes: 0ef5164a81fbf ("mfd/omap1: htc-i2cpld: Convert to a pure GPIO driver")
Signed-off-by: Peng Wu <wupeng58@huawei.com>
---
 drivers/mfd/htc-i2cpld.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index 97d47715aa97..b45b1346ab54 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -567,23 +567,26 @@ static int htcpld_core_probe(struct platform_device *pdev)
 	htcpld->int_reset_gpio_hi = gpiochip_request_own_desc(&htcpld->chip[2].chip_out,
 							      7, "htcpld-core", GPIO_ACTIVE_HIGH,
 							      GPIOD_OUT_HIGH);
-	if (!htcpld->int_reset_gpio_hi)
+	if (IS_ERR(htcpld->int_reset_gpio_hi)) {
 		/*
 		 * If it failed, that sucks, but we can probably
 		 * continue on without it.
 		 */
+		htcpld->int_reset_gpio_hi = NULL;
 		dev_warn(dev, "Unable to request int_reset_gpio_hi -- interrupts may not work\n");
-
+	}
 
 	htcpld->int_reset_gpio_lo = gpiochip_request_own_desc(&htcpld->chip[2].chip_out,
 							      0, "htcpld-core", GPIO_ACTIVE_HIGH,
 							      GPIOD_OUT_LOW);
-	if (!htcpld->int_reset_gpio_lo)
+	if (IS_ERR(htcpld->int_reset_gpio_lo)) {
 		/*
 		 * If it failed, that sucks, but we can probably
 		 * continue on without it.
 		 */
+		htcpld->int_reset_gpio_lo = NULL;
 		dev_warn(dev, "Unable to request int_reset_gpio_lo -- interrupts may not work\n");
+	}
 
 	dev_info(dev, "Initialized successfully\n");
 	return 0;
-- 
2.17.1