Merge tag 'drm-intel-next-fixes-2016-03-16' of http://anongit.freedes…

…ktop.org/git/drm-intel into drm-next * tag 'drm-intel-next-fixes-2016-03-16' of http://anongit.freedesktop.org/git/drm-intel: drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.
mariux64 · Mar 16, 2016 · 189df01 · 189df01
2 parents 5e2368a + 94669e6
commit 189df01
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
@@ -10542,7 +10542,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
 		goto fail;
 	}
 
-	if (drm_atomic_commit(state)) {
+	ret = drm_atomic_commit(state);
+	if (ret) {
 		DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
 		goto fail;
 	}