drm/i915: propagate error from legacy resume handler

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 56c75706055c6124134c175dbb7a84d7ba3b6e54..524c3dfed3809d5b59d4111879bef35862f78e7e 100644 (file)
--- 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);
 }
 
 /**