From c6eaa16873618011157be848ba8e25245acfe16e Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 25 Aug 2011 17:13:32 +0300 Subject: [PATCH] --- yaml --- r: 271428 b: refs/heads/master c: 468c1b934c0367d15f90314ae316cd33551f70a5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/hdmi.c | 1 - trunk/drivers/video/omap2/dss/hdmi_panel.c | 6 +----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a5664f0d284a..df818dfa18da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 937fce138ff295df6f3bbb3b07464e3902b6bc0f +refs/heads/master: 468c1b934c0367d15f90314ae316cd33551f70a5 diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c index bf85cbadc804..fb85ce5a8ab4 100644 --- a/trunk/drivers/video/omap2/dss/hdmi.c +++ b/trunk/drivers/video/omap2/dss/hdmi.c @@ -406,7 +406,6 @@ int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev, cm = hdmi_get_code(timings); if (cm.code == -1) { - DSSERR("Invalid timing entered\n"); return -EINVAL; } diff --git a/trunk/drivers/video/omap2/dss/hdmi_panel.c b/trunk/drivers/video/omap2/dss/hdmi_panel.c index 79a3a5ac8f1c..71aa8134f4fb 100644 --- a/trunk/drivers/video/omap2/dss/hdmi_panel.c +++ b/trunk/drivers/video/omap2/dss/hdmi_panel.c @@ -170,11 +170,7 @@ static int hdmi_check_timings(struct omap_dss_device *dssdev, mutex_lock(&hdmi.hdmi_lock); r = omapdss_hdmi_display_check_timing(dssdev, timings); - if (r) { - DSSERR("Timing cannot be applied\n"); - goto err; - } -err: + mutex_unlock(&hdmi.hdmi_lock); return r; }