OMAPDSS: HDMI: Fix possible NULL reference
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 27 Aug 2013 11:11:48 +0000 (14:11 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 29 Aug 2013 13:43:43 +0000 (16:43 +0300)
Commit 5391e87d1259 (OMAPDSS: remove dispc's dependency to VENC/HDMI)
introduced a possible NULL reference bug in the HDMI driver when setting
timings. In practice the bug shouldn't happen, as the timings have been
verified earlier, and thus the timings should always be ok.

Fix the possible issue by moving the use of the timings pointer inside
the NULL check.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
drivers/video/omap2/dss/hdmi.c

index 44a885b92825fa2603060bddda40d50d76a53853..ea97854308f995dd97f8806cdf029028ea10222f 100644 (file)
@@ -666,10 +666,11 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev,
        hdmi.ip_data.cfg.cm = cm;
 
        t = hdmi_get_timings();
-       if (t != NULL)
+       if (t != NULL) {
                hdmi.ip_data.cfg = *t;
 
-       dispc_set_tv_pclk(t->timings.pixel_clock * 1000);
+               dispc_set_tv_pclk(t->timings.pixel_clock * 1000);
+       }
 
        mutex_unlock(&hdmi.lock);
 }