Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50a0072f authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: propagate error from legacy resume handler 



Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f2888fab

drivers/gpu/drm/i915/i915_drv.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -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);

}

}





/**

/**