From: Marcel Ziswiler <marcel.ziswiler@xxxxxxxxxxx>
Actually report the error codes from of_get_named_gpio() resp.
devm_gpio_request_one() upon trying to get the codec reset resp. sync
GPIOs unless it is just a probe deferral.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@xxxxxxxxxxx>
---
Changes in v2:
- Silence probe deferral as suggested by Stefan.
- Fix line over 80 characters as reported by checkpatch.
sound/soc/tegra/tegra20_ac97.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 682ef33afb5f..2ac6b2d73980 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -351,18 +351,31 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
ret = devm_gpio_request_one(&pdev->dev, ac97->reset_gpio,
GPIOF_OUT_INIT_HIGH, "codec-reset");
if (ret) {
- dev_err(&pdev->dev, "could not get codec-reset GPIO\n");
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev,
+ "could not get codec-reset GPIO: %d\n",
+ ret);
+
goto err_clk_put;
}
} else {
- dev_err(&pdev->dev, "no codec-reset GPIO supplied\n");
+ ret = ac97->reset_gpio;
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev,
+ "no codec-reset GPIO supplied: %d\n",
+ ret);
+
goto err_clk_put;
}
ac97->sync_gpio = of_get_named_gpio(pdev->dev.of_node,
"nvidia,codec-sync-gpio", 0);
if (!gpio_is_valid(ac97->sync_gpio)) {
- dev_err(&pdev->dev, "no codec-sync GPIO supplied\n");
+ ret = ac97->sync_gpio;
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "no codec-sync GPIO supplied: %d\n",
+ ret);
+
goto err_clk_put;
}
--
2.14.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
