ASoC: rt5677: Return error if devm_gpiod_get_optional return ERR_PTR

PATCH Superseded Axel Lin 1 participant 1 message Jul 25, 2015

Subsystems (3)

Sound ASoC Realtek audio codecs

lore

Share & tools

lore

Axel Lin

author

2015-07-25 01:01 UTC #0 lore raw

PATCH 1/1 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 Axel Lin <[email protected]>

---
 sound/soc/codecs/rt5677.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

sound/soc/codecs/rt5677.c +2 -2

index 8d70911..3a074b6 100644
@@ -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 PTR_ERR(rt5677->pow_ldo2);
 	}
 	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 PTR_ERR(rt5677->reset_pin);
 	}
 
 	if (rt5677->pow_ldo2 || rt5677->reset_pin) {

Signature · 1 line

2.1.0