diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-08-08 13:21:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-08-08 13:25:28 +1000 |
| commit | abffedaaa7702d1194934169fe65553804a2b064 (patch) | |
| tree | 4499a12397867d1bb71dc78eab6e31c91028f5fe /drivers/gpu | |
| parent | Linux 5.3-rc3 (diff) | |
| parent | drm/tegra: Fix gpiod_get_from_of_node() regression (diff) | |
| download | linux-dev-abffedaaa7702d1194934169fe65553804a2b064.tar.xz linux-dev-abffedaaa7702d1194934169fe65553804a2b064.zip | |
Merge tag 'drm/tegra/for-5.3-rc4' of git://anongit.freedesktop.org/tegra/linux into drm-fixes
drm/tegra: Fixes for v5.3-rc4
This contains a single fix for a regression introduced by a combination
of a GPIO and a drm/tegra patch merged in v5.3-rc1.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807140634.29166-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/tegra/output.c | 8 |
1 files changed, 6 insertions, 2 deletions
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); |