]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: tas2552: Make the enable-gpio really optional
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 4 Jun 2015 13:04:13 +0000 (16:04 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 4 Jun 2015 16:49:28 +0000 (17:49 +0100)
Do not fail the probe if the enable-gpio is not specifiedbut handle
deferred probe case.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/tas2552.c

index dfb4ff5cc9ea1a697e050cc2d9343dfc9ff58618..ff82f46ba504de75599562bc38e1c492f26b4182 100644 (file)
@@ -486,8 +486,12 @@ static int tas2552_probe(struct i2c_client *client,
                return -ENOMEM;
 
        data->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
-       if (IS_ERR(data->enable_gpio))
-               return PTR_ERR(data->enable_gpio);
+       if (IS_ERR(data->enable_gpio)) {
+               if (PTR_ERR(data->enable_gpio) == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+
+               data->enable_gpio = NULL;;
+       }
 
        data->tas2552_client = client;
        data->regmap = devm_regmap_init_i2c(client, &tas2552_regmap_config);