xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: rt4801: Fix NULL pointer dereference if priv->enable_gpios is NULL

Browse Source 
[ Upstream commit cb2381cbecb81a8893b2d1e1af29bc2e5531df27 ]

devm_gpiod_get_array_optional may return NULL if no GPIO was assigned.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20210603094944.1114156-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Axel Lin
2021-06-03 17:49:44 +08:00
committed by Greg Kroah-Hartman
parent 2f8f0e97ce
commit ba8a26a7ce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/rt4801-regulator.c
View File

@@ -66,7 +66,7 @@ static int rt4801_enable(struct regulator_dev *rdev)
struct gpio_descs *gpios = priv->enable_gpios; struct gpio_descs *gpios = priv->enable_gpios;
int id = rdev_get_id(rdev), ret; int id = rdev_get_id(rdev), ret;
if (gpios->ndescs <= id) { if (!gpios || gpios->ndescs <= id) {
dev_warn(&rdev->dev, "no dedicated gpio can control\n"); dev_warn(&rdev->dev, "no dedicated gpio can control\n");
goto bypass_gpio; goto bypass_gpio;
} }
@@ -88,7 +88,7 @@ static int rt4801_disable(struct regulator_dev *rdev)
struct gpio_descs *gpios = priv->enable_gpios; struct gpio_descs *gpios = priv->enable_gpios;
int id = rdev_get_id(rdev); int id = rdev_get_id(rdev);
if (gpios->ndescs <= id) { if (!gpios || gpios->ndescs <= id) {
dev_warn(&rdev->dev, "no dedicated gpio can control\n"); dev_warn(&rdev->dev, "no dedicated gpio can control\n");
goto bypass_gpio; goto bypass_gpio;
} }