]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
regulator: slg51000: Fix a couple NULL vs IS_ERR() checks
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 8 Aug 2019 10:33:35 +0000 (13:33 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 8 Aug 2019 19:41:09 +0000 (20:41 +0100)
The devm_gpiod_get_from_of_node() function never returns NULL, it
returns error pointers on error.

Fixes: a867bde3dd03 ("regulator: slg51000: add slg51000 regulator driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20190808103335.GD30506@mwanda
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/slg51000-regulator.c

index 04b732991d6955f3cf917644725be7fff756acd3..4d859fef55e681e81701fb023f0842b23f2413ff 100644 (file)
@@ -205,7 +205,7 @@ static int slg51000_of_parse_cb(struct device_node *np,
        ena_gpiod = devm_gpiod_get_from_of_node(chip->dev, np,
                                                "enable-gpios", 0,
                                                gflags, "gpio-en-ldo");
-       if (ena_gpiod) {
+       if (!IS_ERR(ena_gpiod)) {
                config->ena_gpiod = ena_gpiod;
                devm_gpiod_unhinge(chip->dev, config->ena_gpiod);
        }
@@ -459,7 +459,7 @@ static int slg51000_i2c_probe(struct i2c_client *client,
                                               GPIOD_OUT_HIGH
                                               | GPIOD_FLAGS_BIT_NONEXCLUSIVE,
                                               "slg51000-cs");
-       if (cs_gpiod) {
+       if (!IS_ERR(cs_gpiod)) {
                dev_info(dev, "Found chip selector property\n");
                chip->cs_gpiod = cs_gpiod;
        }