diff --git a/[refs] b/[refs]
index bd22ce7f95d0..5439f5ff9c18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c552dd79346f86a3b53e41255c92c6f560b80fb
+refs/heads/master: ff6fdbed8f465f796da7ab32cde67e2dfb9e1f8f
diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c
index db0237dec6c4..e7e6c25b560c 100644
--- a/trunk/drivers/gpu/drm/drm_crtc_helper.c
+++ b/trunk/drivers/gpu/drm/drm_crtc_helper.c
@@ -842,7 +842,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
 			/* If the encoder is reused for another connector, then
 			 * the appropriate crtc will be set later.
 			 */
-			connector->encoder->crtc = NULL;
+			if (connector->encoder)
+				connector->encoder->crtc = NULL;
 			connector->encoder = new_encoder;
 		}
 	}