| From 74828183a3e199df8430a43e94cc751a4825a5ec Mon Sep 17 00:00:00 2001 |
| From: Dmitry Osipenko <digetx@gmail.com> |
| Date: Fri, 5 Jul 2019 18:11:39 +0300 |
| Subject: [PATCH] drm/tegra: Fix gpiod_get_from_of_node() regression |
| |
| commit 2a6fc3cb5cb68597f1072bfeef28d2ca02310220 upstream. |
| |
| That function now returns ERR_PTR instead of NULL if "hpd-gpio" is not |
| present in device-tree. The offending patch missed to adapt the Tegra's |
| DRM driver for the API change. |
| |
| Fixes: 025bf37725f1 ("gpio: Fix return value mismatch of function gpiod_get_from_of_node()") |
| Signed-off-by: Dmitry Osipenko <digetx@gmail.com> |
| Acked-by: Jon Hunter <jonathanh@nvidia.com> |
| Signed-off-by: Thierry Reding <treding@nvidia.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c |
| index 274cb955e2e1..bdcaa4c7168c 100644 |
| --- a/drivers/gpu/drm/tegra/output.c |
| +++ b/drivers/gpu/drm/tegra/output.c |
| @@ -126,8 +126,12 @@ int tegra_output_probe(struct tegra_output *output) |
| "nvidia,hpd-gpio", 0, |
| GPIOD_IN, |
| "HDMI hotplug detect"); |
| - if (IS_ERR(output->hpd_gpio)) |
| - return PTR_ERR(output->hpd_gpio); |
| + if (IS_ERR(output->hpd_gpio)) { |
| + if (PTR_ERR(output->hpd_gpio) != -ENOENT) |
| + return PTR_ERR(output->hpd_gpio); |
| + |
| + output->hpd_gpio = NULL; |
| + } |
| |
| if (output->hpd_gpio) { |
| err = gpiod_to_irq(output->hpd_gpio); |
| -- |
| 2.7.4 |
| |
