diff options
author | Jani Nikula <jani.nikula@intel.com> | 2023-01-02 10:31:03 +0100 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2023-01-02 10:31:03 +0100 |
commit | 0d8eae7b124e2ddaee00f186fe922450faad0ed7 (patch) | |
tree | 5acf7a7a4300665c26b128d9afd1843b402e8b8e /drivers/gpu/drm/tegra/dc.c | |
parent | drm/i915/mtl: Add support of Tile4 to MTL (diff) | |
parent | Linux 6.2-rc1 (diff) | |
download | linux-0d8eae7b124e2ddaee00f186fe922450faad0ed7.tar.xz linux-0d8eae7b124e2ddaee00f186fe922450faad0ed7.zip |
Merge drm/drm-next into drm-intel-next
Sync up with v6.2-rc1.
Signed-off-by: Jani Nikula <jani.nikula@intel.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); |