regulator: lm363x: Check return value of gpiod_get_index_optional
gpiod_get_index_optional can return ERR_PTR, add IS_ERR checking for it. While at it, also remove a redundant NULL test for gpiod in error path. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
b735f41dcb
Коммит
c68f47aa02
|
@ -258,6 +258,9 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
|
||||||
* Register update is required if the pin is used.
|
* Register update is required if the pin is used.
|
||||||
*/
|
*/
|
||||||
gpiod = lm363x_regulator_of_get_enable_gpio(dev, id);
|
gpiod = lm363x_regulator_of_get_enable_gpio(dev, id);
|
||||||
|
if (IS_ERR(gpiod))
|
||||||
|
return PTR_ERR(gpiod);
|
||||||
|
|
||||||
if (gpiod) {
|
if (gpiod) {
|
||||||
cfg.ena_gpiod = gpiod;
|
cfg.ena_gpiod = gpiod;
|
||||||
|
|
||||||
|
@ -265,8 +268,7 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
|
||||||
LM3632_EXT_EN_MASK,
|
LM3632_EXT_EN_MASK,
|
||||||
LM3632_EXT_EN_MASK);
|
LM3632_EXT_EN_MASK);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
if (gpiod)
|
gpiod_put(gpiod);
|
||||||
gpiod_put(gpiod);
|
|
||||||
dev_err(dev, "External pin err: %d\n", ret);
|
dev_err(dev, "External pin err: %d\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче