diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-30 06:08:53 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-30 06:08:58 +0300 |
| commit | 02339a83dc828cf1b6dfcb42502f80f7c8d7e33f (patch) | |
| tree | c6226c233d97e6e996152474db8562460a2b0663 /drivers/gpu/drm/tegra/dc.c | |
| parent | 795bd9bb21c694ebcee38e8026ebeac4a63929bf (diff) | |
| parent | 08fef75f5e17c80cdb9ab56d65685cb43c8e44d3 (diff) | |
| download | linux-02339a83dc828cf1b6dfcb42502f80f7c8d7e33f.tar.xz | |
Merge tag 'drm/tegra/for-6.2-rc1' of https://gitlab.freedesktop.org/drm/tegra into drm-next
drm/tegra: Changes for v6.2-rc1
This contains a bunch of cleanups across the board as well as support
for the NVDEC hardware found on the Tegra234 SoC.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221125155219.3352952-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/gpu/drm/tegra/dc.c')
| -rw-r--r-- | drivers/gpu/drm/tegra/dc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index bd0f60704467..a67453cee883 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -3205,8 +3205,10 @@ static int tegra_dc_probe(struct platform_device *pdev) usleep_range(2000, 4000); err = reset_control_assert(dc->rst); - if (err < 0) + if (err < 0) { + clk_disable_unprepare(dc->clk); return err; + } usleep_range(2000, 4000); |