summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2021-03-05 03:49:30 +0000
committerMark Brown <broonie@kernel.org>2021-03-10 12:22:27 +0000
commite9e7fce0384b43f9b6c42dee1a79c0a1c332f326 (patch)
tree22398fd3e1db3b2c72253a1c2bbf1cc315d2f6c4
parent98b94b6e38ca0c4eeb29949c656f6a315000c23e (diff)
downloadlinux-e9e7fce0384b43f9b6c42dee1a79c0a1c332f326.tar.gz
linux-e9e7fce0384b43f9b6c42dee1a79c0a1c332f326.tar.bz2
linux-e9e7fce0384b43f9b6c42dee1a79c0a1c332f326.zip
regulator: rt4831: Fix return value check in rt4831_regulator_probe()
In case of error, the function dev_get_regmap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 9351ab8b0cb6 ("regulator: rt4831: Adds support for Richtek RT4831 DSV regulator") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Link: https://lore.kernel.org/r/20210305034930.3236099-1-weiyongjun1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/rt4831-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/rt4831-regulator.c b/drivers/regulator/rt4831-regulator.c
index 3d4695ded629..e3aaac90d238 100644
--- a/drivers/regulator/rt4831-regulator.c
+++ b/drivers/regulator/rt4831-regulator.c
@@ -153,9 +153,9 @@ static int rt4831_regulator_probe(struct platform_device *pdev)
int i, ret;
regmap = dev_get_regmap(pdev->dev.parent, NULL);
- if (IS_ERR(regmap)) {
+ if (!regmap) {
dev_err(&pdev->dev, "Failed to init regmap\n");
- return PTR_ERR(regmap);
+ return -ENODEV;
}
/* Configure DSV mode to normal by default */