diff options
| author | Elaine Wang | 2016-12-19 11:19:05 +0100 |
|---|---|---|
| committer | Jani Nikula | 2016-12-22 11:29:17 +0100 |
| commit | 108109444ff64fb1a2976174ec23e9e2117b5709 (patch) | |
| tree | 58909e09df02c6be320da59a49610f90fd79952d /drivers/gpu/drm/i915/intel_audio.c | |
| parent | drm/i915/glk: Add new bit fields in MIPI CTRL register (diff) | |
| download | kernel-qcow2-linux-108109444ff64fb1a2976174ec23e9e2117b5709.tar.gz kernel-qcow2-linux-108109444ff64fb1a2976174ec23e9e2117b5709.tar.xz kernel-qcow2-linux-108109444ff64fb1a2976174ec23e9e2117b5709.zip | |
drm/i915: Check num_pipes before initializing audio component
when num_pipes is zero, it indicates there is no display and HDMI
audio doesn't exist.
v2: Move the check from caller to callee for consistency.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Elaine Wang <elaine.wang@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1482142746-21663-1-git-send-email-elaine.wang@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_audio.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 3bbc96c1767f..16c202781db0 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -928,6 +928,9 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv) { int ret; + if (INTEL_INFO(dev_priv)->num_pipes == 0) + return; + ret = component_add(dev_priv->drm.dev, &i915_audio_component_bind_ops); if (ret < 0) { DRM_ERROR("failed to add audio component (%d)\n", ret); |