diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-13 11:23:18 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-13 11:23:18 +0300 |
| commit | 9a4f35865ffcb2f4603375eadabe0d475fab1a0f (patch) | |
| tree | 1465ac717deee029d3a9c1f7235ba85be57feefa /sound/soc/codecs/adau1977.c | |
| parent | eef0342cf32689f77d78ee3302999e5caaa6a8f3 (diff) | |
| parent | c30cf8cbe55413cd643a0bdd3442d75950caa918 (diff) | |
| download | linux-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/codecs/adau1977.c')
| -rw-r--r-- | sound/soc/codecs/adau1977.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c index 70ab35744aba..7ad8e156e2df 100644 --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -938,22 +938,15 @@ int adau1977_probe(struct device *dev, struct regmap *regmap, adau1977->dvdd_reg = NULL; } - adau1977->reset_gpio = devm_gpiod_get(dev, "reset"); - if (IS_ERR(adau1977->reset_gpio)) { - ret = PTR_ERR(adau1977->reset_gpio); - if (ret != -ENOENT && ret != -ENOSYS) - return PTR_ERR(adau1977->reset_gpio); - adau1977->reset_gpio = NULL; - } + adau1977->reset_gpio = devm_gpiod_get_optional(dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(adau1977->reset_gpio)) + return PTR_ERR(adau1977->reset_gpio); dev_set_drvdata(dev, adau1977); - if (adau1977->reset_gpio) { - ret = gpiod_direction_output(adau1977->reset_gpio, 0); - if (ret) - return ret; + if (adau1977->reset_gpio) ndelay(100); - } ret = adau1977_power_enable(adau1977); if (ret) |