From: Konrad Zapalowicz Date: Thu, 19 Jun 2014 17:07:15 +0000 (+0200) Subject: drivers/i915: Fix unnoticed failure of init_ring_common() X-Git-Tag: v3.17-rc1~82^2~63^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c33baa6b3bbb01c1a88dceba986b20e6642cf31;p=karo-tx-linux.git drivers/i915: Fix unnoticed failure of init_ring_common() This commit add check for return value of init_ring_common() in the init_render_ring(). Now, when failure is detected the error code is propagated to the caller instead of being ignored. Signed-off-by: Konrad Zapalowicz Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index b96edaf905de..2faef2605e97 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -604,6 +604,8 @@ static int init_render_ring(struct intel_engine_cs *ring) struct drm_device *dev = ring->dev; struct drm_i915_private *dev_priv = dev->dev_private; int ret = init_ring_common(ring); + if (ret) + return ret; /* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */ if (INTEL_INFO(dev)->gen >= 4 && INTEL_INFO(dev)->gen < 7)