diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
| commit | 94ac2ab3fff96814d7460a27a0e9d004abbd4128 (patch) | |
| tree | 9a4eb8cc234b540b0f4b93363109cdd37a20540b /drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | |
| parent | Adding debian version 6.8.12-1. (diff) | |
| download | linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.tar.xz linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.zip | |
Merging upstream version 6.9.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/gpu/drm/panel/panel-samsung-atna33xc20.c')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c b/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c index 9c336c7156..76c2a8f671 100644 --- a/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c +++ b/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c @@ -109,17 +109,19 @@ static int atana33xc20_resume(struct device *dev) if (hpd_asserted < 0) ret = hpd_asserted; - if (ret) { + if (ret) dev_warn(dev, "Error waiting for HPD GPIO: %d\n", ret); - goto error; - } - } else if (p->aux->wait_hpd_asserted) { + + return ret; + } + + if (p->aux->wait_hpd_asserted) { ret = p->aux->wait_hpd_asserted(p->aux, HPD_MAX_US); - if (ret) { + if (ret) dev_warn(dev, "Controller error waiting for HPD: %d\n", ret); - goto error; - } + + return ret; } /* @@ -131,12 +133,6 @@ static int atana33xc20_resume(struct device *dev) * right times. */ return 0; - -error: - drm_dp_dpcd_set_powered(p->aux, false); - regulator_disable(p->supply); - - return ret; } static int atana33xc20_disable(struct drm_panel *panel) |