2016-12-02 10:50:26 +00:00
|
|
|
From c8930bab8d094c5a0c41e17fa0c6f855b93fd0d1 Mon Sep 17 00:00:00 2001
|
2016-06-08 09:59:37 +00:00
|
|
|
From: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Date: Mon, 4 Apr 2016 14:25:59 -0700
|
2016-09-10 12:54:26 +00:00
|
|
|
Subject: [PATCH] drm/vc4: Fix NULL deref in HDMI init error path
|
2016-06-08 09:59:37 +00:00
|
|
|
|
|
|
|
|
If you make it here other than through err_destroy_encoder, vc4->hdmi
|
|
|
|
|
is still NULL.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
|
|
(cherry picked from commit 5883980313af70aec0ceebaef6ef0709726e5e63)
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
|
|
|
@@ -573,7 +573,7 @@ err_unprepare_hsm:
|
|
|
|
|
err_unprepare_pix:
|
|
|
|
|
clk_disable_unprepare(hdmi->pixel_clock);
|
|
|
|
|
err_put_i2c:
|
|
|
|
|
- put_device(&vc4->hdmi->ddc->dev);
|
|
|
|
|
+ put_device(&hdmi->ddc->dev);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
