OMAPDSS: HDMI: Add locking for hdmi interface set timing functions

[deliverable/linux.git] / drivers / video / omap2 / dss / hdmi.c

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 964a19500c0e696a53d5145c80fc0e825ede08fe..0cdf24673d48d74050ac56a72b08556bd1777151 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -561,6 +561,8 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev,
        struct hdmi_cm cm;
        const struct hdmi_config *t;
 
+       mutex_lock(&hdmi.lock);
+
        cm = hdmi_get_code(timings);
        hdmi.ip_data.cfg.cm = cm;
 
@@ -579,6 +581,8 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev,
        } else {
                dss_mgr_set_timings(dssdev->manager, &t->timings);
        }
+
+       mutex_unlock(&hdmi.lock);
 }
 
 static void hdmi_dump_regs(struct seq_file *s)