diff options
| author | Imre Deak <imre.deak@intel.com> | 2014-10-23 19:23:17 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-24 16:34:16 +0200 |
| commit | 50a0072f3829d36767f3359649d224f18f7987f7 (patch) | |
| tree | 17580a7cf22af3ba6979a1d8570926d0e081224c /drivers/gpu/drm/i915/i915_drv.c | |
| parent | f2888fabfbbccc0acb4d21713b91d557edc1e64f (diff) | |
| download | op-kernel-dev-50a0072f3829d36767f3359649d224f18f7987f7.zip op-kernel-dev-50a0072f3829d36767f3359649d224f18f7987f7.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 9 |
1 files 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); } /** |
