summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-06-22 20:40:23 +0100
committerAndy Green <andy.green@linaro.org>2011-06-22 20:40:23 +0100
commitbf7999aeaff7b5a67a6e2ea065f55d19b8607fa6 (patch)
treea740662622967c7bbced55b7026d751f6daf0ee8
parent07fc4d282312bb9dfdb71b47ddafbeb3d8de365f (diff)
Subject: [PATCH 14/19] OMAP2: DSS: HDMI: removing error msg from check_timing
The check_timing call is used to validate the timing before actually appling it, so it's expected to treat unsupported timings. It makes no sense to print an error message for the user saying that the timing could not be applied (it's not even being applied by this function). Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
-rw-r--r--drivers/video/omap2/dss/hdmi.c1
-rw-r--r--drivers/video/omap2/dss/hdmi_omap4_panel.c7
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 04ce20e0617..d1ca3bc17cb 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1238,7 +1238,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/drivers/video/omap2/dss/hdmi_omap4_panel.c b/drivers/video/omap2/dss/hdmi_omap4_panel.c
index 0bac74dc9a4..e2565d4ea31 100644
--- a/drivers/video/omap2/dss/hdmi_omap4_panel.c
+++ b/drivers/video/omap2/dss/hdmi_omap4_panel.c
@@ -191,12 +191,9 @@ 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;
}