From: Dave Airlie <airlied@gmail.com>
Date: Fri, 12 Apr 2013 03:25:20 +0000 (+1000)
Subject: udl: handle EDID failure properly.
X-Git-Tag: v3.8.8~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=69bcccfef278d0b58b684fbd3ead0c52e4384d53;p=users%2Fjedix%2Flinux-maple.git

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>
---

diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index fe5cdbcf26360..b44d548c56f8e 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