diff --git a/[refs] b/[refs] index 726325c09bb5..d52f379a3b39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b9676e7ac6eff4f50f1b48b6c36664f55b79507 +refs/heads/master: 0ddfa7d574e0f3a7510b0be6c8ed807af017223f diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c index 326f28e04aab..0acb83a63727 100644 --- a/trunk/drivers/gpu/drm/drm_edid.c +++ b/trunk/drivers/gpu/drm/drm_edid.c @@ -1383,7 +1383,7 @@ drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing) for (i = 0; i < 6; i++) { for (j = 7; j > 0; j--) { m = (i * 8) + (7 - j); - if (m > num_est3_modes) + if (m >= num_est3_modes) break; if (est[i] & (1 << j)) { mode = drm_find_dmt(connector->dev,