@@ -1248,12 +1248,11 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
block = new;
for (j = 1; j <= block[0x7e]; j++) {
+ u8 *ext_block = block + (valid_extensions + 1) * EDID_LENGTH;
for (i = 0; i < 4; i++) {
- if (get_edid_block(data,
- block + (valid_extensions + 1) * EDID_LENGTH,
- j, EDID_LENGTH))
+ if (get_edid_block(data, ext_block, j, EDID_LENGTH))
goto out;
- if (drm_edid_block_valid(block + (valid_extensions + 1) * EDID_LENGTH, j, print_bad_edid)) {
+ if (drm_edid_block_valid(ext_block, j, print_bad_edid)) {
valid_extensions++;
break;
}