From 301f92b9b90392470a19250c90fe088496262b38 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 19 Nov 2012 09:44:57 +0000 Subject: [PATCH] --- yaml --- r: 345309 b: refs/heads/master c: e655d122a71332d0d26b5c0909eb395da31af0c0 h: refs/heads/master i: 345307: dfe2135a812590aeb03866fd6e8fb8d23381737f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8be2b4dc7daf..a64c843279aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e1c156ff04b1920c33b59c5b8564afc8bf4f2cd +refs/heads/master: e655d122a71332d0d26b5c0909eb395da31af0c0 diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c index 9fd0c3555c30..6a1b2cc39898 100644 --- a/trunk/drivers/gpu/drm/drm_crtc.c +++ b/trunk/drivers/gpu/drm/drm_crtc.c @@ -3191,6 +3191,8 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, size = EDID_LENGTH * (1 + edid->extensions); connector->edid_blob_ptr = drm_property_create_blob(connector->dev, size, edid); + if (!connector->edid_blob_ptr) + return -EINVAL; ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property,