drm/i915: use the default context

[deliverable/linux.git] / drivers / gpu / drm / drm_edid_load.c

diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index da9acba2dd6c7f7dc7de62361ac8e832c81eed66..66d4a28ad5a23fc2cf4b7b745091296444e287b1 100644 (file)
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -173,7 +173,7 @@ static int edid_load(struct drm_connector *connector, char *name,
        }
        memcpy(edid, fwdata, fwsize);
 
-       if (!drm_edid_block_valid(edid)) {
+       if (!drm_edid_block_valid(edid, 0)) {
                DRM_ERROR("Base block of EDID firmware \"%s\" is invalid ",
                    name);
                kfree(edid);
@@ -185,7 +185,7 @@ static int edid_load(struct drm_connector *connector, char *name,
                if (i != valid_extensions + 1)
                        memcpy(edid + (valid_extensions + 1) * EDID_LENGTH,
                            edid + i * EDID_LENGTH, EDID_LENGTH);
-               if (drm_edid_block_valid(edid + i * EDID_LENGTH))
+               if (drm_edid_block_valid(edid + i * EDID_LENGTH, i))
                        valid_extensions++;
        }
 
@@ -220,18 +220,18 @@ int drm_load_edid_firmware(struct drm_connector *connector)
 {
        char *connector_name = drm_get_connector_name(connector);
        char *edidname = edid_firmware, *last, *colon;
-       int ret = 0;
+       int ret;
 
        if (*edidname == '\0')
-               return ret;
+               return 0;
 
        colon = strchr(edidname, ':');
        if (colon != NULL) {
                if (strncmp(connector_name, edidname, colon - edidname))
-                       return ret;
+                       return 0;
                edidname = colon + 1;
                if (*edidname == '\0')
-                       return ret;
+                       return 0;
        }
 
        last = edidname + strlen(edidname) - 1;