aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_audio.c
diff options
context:
space:
mode:
authorGravatar Daniel Vetter <daniel.vetter@ffwll.ch> 2015-12-04 15:54:30 +0100
committerGravatar Daniel Vetter <daniel.vetter@ffwll.ch> 2015-12-04 15:54:30 +0100
commitd8578836ad2ebaaf0a899c72d12201009e0ad1e5 (patch)
treeb963cf848d5608de898c966d8f3d49660725850e /drivers/gpu/drm/i915/intel_audio.c
parentdrm/i915: Clean up device info structure definitions (diff)
downloadlinux-d8578836ad2ebaaf0a899c72d12201009e0ad1e5.tar.gz
linux-d8578836ad2ebaaf0a899c72d12201009e0ad1e5.tar.bz2
linux-d8578836ad2ebaaf0a899c72d12201009e0ad1e5.zip
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_audio.c')
-rw-r--r--drivers/gpu/drm/i915/intel_audio.c4
1 files changed, 4 insertions, 0 deletions
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;
}