Skip to content

Commit abffeda

Browse files
committed
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 <[email protected]> From: Thierry Reding <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents e21a712 + 2a6fc3c commit abffeda

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/gpu/drm/tegra/output.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,12 @@ int tegra_output_probe(struct tegra_output *output)
126126
"nvidia,hpd-gpio", 0,
127127
GPIOD_IN,
128128
"HDMI hotplug detect");
129-
if (IS_ERR(output->hpd_gpio))
130-
return PTR_ERR(output->hpd_gpio);
129+
if (IS_ERR(output->hpd_gpio)) {
130+
if (PTR_ERR(output->hpd_gpio) != -ENOENT)
131+
return PTR_ERR(output->hpd_gpio);
132+
133+
output->hpd_gpio = NULL;
134+
}
131135

132136
if (output->hpd_gpio) {
133137
err = gpiod_to_irq(output->hpd_gpio);

0 commit comments

Comments
 (0)