1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index 8805266a52f4..1123111d3940 100644
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -2322,6 +2322,11 @@ static int dispc_ovl_calc_scaling(unsigned long pclk, unsigned long lclk,
         if (width == out_width && height == out_height)
                 return 0;
 
+        if (pclk == 0 || mgr_timings->pixelclock == 0) {
+                DSSERR("cannot calculate scaling settings: pclk is zero\n");
+                return -EINVAL;
+        }
+
         if ((caps & OMAP_DSS_OVL_CAP_SCALE) == 0)
                 return -EINVAL;