diff --git a/sys/dev/drm/drm_atomic_helper.c b/sys/dev/drm/drm_atomic_helper.c
--- a/sys/dev/drm/drm_atomic_helper.c
+++ b/sys/dev/drm/drm_atomic_helper.c
@@ -2937,7 +2937,7 @@
 
 	ret = handle_conflicting_encoders(state, true);
 	if (ret)
-		return ret;
+		goto fail;
 
 	ret = drm_atomic_commit(state);