Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / staging / gma500 / psb_intel_bios.c

diff --git a/drivers/staging/gma500/psb_intel_bios.c b/drivers/staging/gma500/psb_intel_bios.c
index 48ac8ba..417965d 100644 (file)
--- a/drivers/staging/gma500/psb_intel_bios.c
+++ b/drivers/staging/gma500/psb_intel_bios.c
@@ -154,10 +154,15 @@ static void parse_lfp_panel_data(struct drm_psb_private *dev_priv,
 
        fill_detail_timing_data(panel_fixed_mode, dvo_timing);
 
-       dev_priv->lfp_lvds_vbt_mode = panel_fixed_mode;
-
-       DRM_DEBUG("Found panel mode in BIOS VBT tables:\n");
-       drm_mode_debug_printmodeline(panel_fixed_mode);
+       if (panel_fixed_mode->htotal > 0 && panel_fixed_mode->vtotal > 0) {
+               dev_priv->lfp_lvds_vbt_mode = panel_fixed_mode;
+               DRM_DEBUG("Found panel mode in BIOS VBT tables:\n");
+               drm_mode_debug_printmodeline(panel_fixed_mode);
+       } else {
+               DRM_DEBUG("Ignoring bogus LVDS VBT mode.\n");
+               dev_priv->lvds_vbt = 0;
+               kfree(panel_fixed_mode);
+       }
 
        return;
 }