From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 12 Jun 2015 09:19:15 +0000 (+0800)
Subject: ASoC: rt5645: Use devm_gpiod_get_optional for hp-detect
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=25c8888ad65f812c847ae58398a5f8f1b20b0a95;p=linux-beck.git

ASoC: rt5645: Use devm_gpiod_get_optional for hp-detect

Since hp-detect is optional, use devm_gpiod_get_optional instead.
In additional, it should return error if devm_gpiod_get_optional fails.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 18842642a34e..43440436fd7b 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3268,11 +3268,12 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
 	else
 		rt5645_parse_dt(rt5645, &i2c->dev);
 
-	rt5645->gpiod_hp_det = devm_gpiod_get(&i2c->dev, "hp-detect", GPIOD_IN);
+	rt5645->gpiod_hp_det = devm_gpiod_get_optional(&i2c->dev, "hp-detect",
+						       GPIOD_IN);
 
 	if (IS_ERR(rt5645->gpiod_hp_det)) {
-		rt5645->gpiod_hp_det = NULL;
 		dev_err(&i2c->dev, "failed to initialize gpiod\n");
+		return PTR_ERR(rt5645->gpiod_hp_det);
 	}
 
 	rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap);