aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2013-04-12 13:25:20 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-16 21:48:29 -0700
commit69bcccfef278d0b58b684fbd3ead0c52e4384d53 (patch)
tree3f7b7eaf8aeed68998d787d3fbeac135b407b062
parentbea692a5004128c029112632c546e320d71fe99d (diff)
downloadlinux-linaro-stable-69bcccfef278d0b58b684fbd3ead0c52e4384d53.tar.gz
udl: handle EDID failure properly.
commit 1baee58638fc58248625255f5c5fcdb987f11b1f upstream. Don't oops seems proper. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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