From: Imre Deak Date: Thu, 23 Oct 2014 16:23:17 +0000 (+0300) Subject: drm/i915: propagate error from legacy resume handler X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50a0072f3829d36767f3359649d224f18f7987f7;p=linux-beck.git drm/i915: propagate error from legacy resume handler Signed-off-by: Imre Deak Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 56c75706055c..524c3dfed380 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -810,10 +810,13 @@ int i915_resume(struct drm_device *dev) static int i915_resume_legacy(struct drm_device *dev) { - i915_resume_early(dev); - i915_resume(dev); + int ret; - return 0; + ret = i915_resume_early(dev); + if (ret) + return ret; + + return i915_resume(dev); } /**