From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130507035850.102141403@goodmis.org> Date: Mon, 06 May 2013 23:58:07 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dave Airlie Subject: [055/126] udl: handle EDID failure properly. References: <20130507035712.909872333@goodmis.org> Content-Disposition: inline; filename=0055-udl-handle-EDID-failure-properly.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.3 stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Airlie [ Upstream commit 1baee58638fc58248625255f5c5fcdb987f11b1f ] Don't oops seems proper. Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie Signed-off-by: Steven Rostedt --- drivers/gpu/drm/udl/udl_connector.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index 8d9dc44..2185ed8 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c @@ -56,6 +56,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; + } connector->display_info.raw_edid = (char *)edid; -- 1.7.10.4