aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/hdmi.c1
-rw-r--r--drivers/video/omap2/dss/hdmi_panel.c6
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index bf85cbadc80..fb85ce5a8ab 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -406,7 +406,6 @@ int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev,
406 406
407 cm = hdmi_get_code(timings); 407 cm = hdmi_get_code(timings);
408 if (cm.code == -1) { 408 if (cm.code == -1) {
409 DSSERR("Invalid timing entered\n");
410 return -EINVAL; 409 return -EINVAL;
411 } 410 }
412 411
diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index 79a3a5ac8f1..71aa8134f4f 100644
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -170,11 +170,7 @@ static int hdmi_check_timings(struct omap_dss_device *dssdev,
170 mutex_lock(&hdmi.hdmi_lock); 170 mutex_lock(&hdmi.hdmi_lock);
171 171
172 r = omapdss_hdmi_display_check_timing(dssdev, timings); 172 r = omapdss_hdmi_display_check_timing(dssdev, timings);
173 if (r) { 173
174 DSSERR("Timing cannot be applied\n");
175 goto err;
176 }
177err:
178 mutex_unlock(&hdmi.hdmi_lock); 174 mutex_unlock(&hdmi.hdmi_lock);
179 return r; 175 return r;
180} 176}