OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6a8beef
)
Revert "drm/i915: Remove superfluous NULL check"
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Fri, 4 Dec 2015 14:54:30 +0000
(15:54 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Fri, 4 Dec 2015 14:54:30 +0000
(15:54 +0100)
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>
drivers/gpu/drm/i915/intel_audio.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_audio.c
b/drivers/gpu/drm/i915/intel_audio.c
index
9730245
..
9aa83e7
100644
(file)
--- 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;
}