Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8163c86 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: rt5677: Return error if devm_gpiod_get_optional return ERR_PTR 



If devm_gpiod_get_optional() return ERR_PTR, it means something wrong
so request gpio fails. We had better return error in such case.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f285f161

sound/soc/codecs/rt5677.c

+2 −2
Original line number Diff line number Diff line
@@ -5133,14 +5133,14 @@ static int rt5677_i2c_probe(struct i2c_client *i2c, 
	if (IS_ERR(rt5677->pow_ldo2)) {

		ret = PTR_ERR(rt5677->pow_ldo2);

		dev_err(&i2c->dev, "Failed to request POW_LDO2: %d\n", ret);

		rt5677->pow_ldo2 = 0;

		return ret;

	}

	rt5677->reset_pin = devm_gpiod_get_optional(&i2c->dev,

			"realtek,reset", GPIOD_OUT_HIGH);

	if (IS_ERR(rt5677->reset_pin)) {

		ret = PTR_ERR(rt5677->reset_pin);

		dev_err(&i2c->dev, "Failed to request RESET: %d\n", ret);

		rt5677->reset_pin = 0;

		return ret;

	}



	if (rt5677->pow_ldo2 || rt5677->reset_pin) {