From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 4 Dec 2015 14:54:30 +0000 (+0100)
Subject: Revert "drm/i915: Remove superfluous NULL check"
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d8578836ad2ebaaf0a899c72d12201009e0ad1e5;p=deliverable%2Flinux.git

Revert "drm/i915: Remove superfluous NULL check"

This reverts commit 89f41f4f90741fe94b6da9d4d366628a9b0be8f1.

It's possible that ->crtc is NULL in here. Noticed by Ville.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 97302457e7f9..9aa83e71b792 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -653,6 +653,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,
 		intel_dig_port = enc_to_dig_port(&intel_encoder->base);
 		if (port == intel_dig_port->port) {
 			crtc = to_intel_crtc(intel_encoder->base.crtc);
+			if (!crtc) {
+				DRM_DEBUG_KMS("%s: crtc is NULL\n", __func__);
+				continue;
+			}
 			pipe = crtc->pipe;
 			break;
 		}