summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2013-04-12 13:25:20 +1000
committerDave Airlie <airlied@redhat.com>2013-04-12 14:20:38 +1000
commit1baee58638fc58248625255f5c5fcdb987f11b1f (patch)
treee1744f67015708760935a3d1d318943c527e7f94 /drivers
parentcfb63bafdb87bbcdc5d6dbbca623d3f69475f118 (diff)
downloadlinux-1baee58638fc58248625255f5c5fcdb987f11b1f.tar.gz
linux-1baee58638fc58248625255f5c5fcdb987f11b1f.tar.bz2
linux-1baee58638fc58248625255f5c5fcdb987f11b1f.zip
udl: handle EDID failure properly.
Don't oops seems proper. Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/udl/udl_connector.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index fe5cdbcf2636..b44d548c56f8 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -61,6 +61,10 @@ static int udl_get_modes(struct drm_connector *connector)
int ret;
edid = (struct edid *)udl_get_edid(udl);
+ if (!edid) {
+ drm_mode_connector_update_edid_property(connector, NULL);
+ return 0;
+ }
/*
* We only read the main block, but if the monitor reports extension