mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20220913071659.94677-1-wupeng58@huawei.com> (raw)

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


             reply	other threads:[~2022-09-13  7:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-13  7:16 Peng Wu [this message]
2022-09-14 12:50 ` Linus Walleij
2022-09-28 10:32 ` Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220913071659.94677-1-wupeng58@huawei.com \
    --to=wupeng58@huawei.com \
    --cc=lee@kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=liwei391@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®