ASoC: rt5645: Use devm_gpiod_get_optional for hp-detect
authorAxel Lin <axel.lin@ingics.com>
Fri, 12 Jun 2015 09:19:15 +0000 (17:19 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 12 Jun 2015 10:52:29 +0000 (11:52 +0100)
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>
sound/soc/codecs/rt5645.c

index 1884264..4344043 100644 (file)
@@ -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);