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>
This commit is contained in:
Imre Deak 2014-10-23 19:23:17 +03:00 committed by Daniel Vetter
parent f2888fabfb
commit 50a0072f38

View File

@ -810,10 +810,13 @@ int i915_resume(struct drm_device *dev)
static int i915_resume_legacy(struct drm_device *dev) static int i915_resume_legacy(struct drm_device *dev)
{ {
i915_resume_early(dev); int ret;
i915_resume(dev);
return 0; ret = i915_resume_early(dev);
if (ret)
return ret;
return i915_resume(dev);
} }
/** /**