From 80250bd25da140dd137ddb341d9caaf70ab45c1f Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Tue, 1 Sep 2009 03:39:04 +0200 Subject: [PATCH] --- yaml --- r: 163949 b: refs/heads/master c: ff6fdbed8f465f796da7ab32cde67e2dfb9e1f8f h: refs/heads/master i: 163947: ec30913cfd1bd7a3d6bcf6008a2536eaa258876e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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; } }