From: Eric Anholt <eric@anholt.net>
Date: Mon, 4 Apr 2016 21:25:59 +0000 (-0700)
Subject: drm/vc4: Fix NULL deref in HDMI init error path
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5883980313af70aec0ceebaef6ef0709726e5e63;p=deliverable%2Flinux.git

drm/vc4: Fix NULL deref in HDMI init error path

If you make it here other than through err_destroy_encoder, vc4->hdmi
is still NULL.

Signed-off-by: Eric Anholt <eric@anholt.net>
---

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index d8b864925fd3..fd2644d231ff 100644
--- 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;
 }