[Intel-gfx] [PATCH v2 03/14] drm/i915: propagate error from legacy resume handler
Imre Deak
imre.deak at intel.com
Thu Oct 23 18:23:17 CEST 2014
Signed-off-by: Imre Deak <imre.deak at intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 56c7570..524c3df 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);
}
/**
--
1.8.4
More information about the Intel-gfx
mailing list