]> git.hungrycats.org Git - linux/commitdiff
udl: handle EDID failure properly.
authorDave Airlie <airlied@gmail.com>
Fri, 12 Apr 2013 03:25:20 +0000 (13:25 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Apr 2013 04:27:26 +0000 (21:27 -0700)
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>
drivers/gpu/drm/udl/udl_connector.c

index 32342247d91bf9682d938d5b4c1dc4fedf43d14c..b8e6463bd14c07e63e249a668218a6157a55f601 100644 (file)
@@ -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;
+       }
 
        connector->display_info.raw_edid = (char *)edid;